Skip to content
Snippets Groups Projects
Commit 313070db authored by adrien-matta's avatar adrien-matta
Browse files

* Fixing travis build part 4

parent 9c685f3d
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,10 @@ script: ...@@ -36,6 +36,10 @@ script:
after_success: after_success:
after_failure:
- cd $NPTOOL/NPLib
- make VERBOSE=true install
branches: branches:
only: only:
- NPTool.2.dev - NPTool.2.dev
......
...@@ -84,7 +84,12 @@ MACRO(subdirlist result curdir) ...@@ -84,7 +84,12 @@ MACRO(subdirlist result curdir)
SET(${result} ${dirlist}) SET(${result} ${dirlist})
ENDMACRO() ENDMACRO()
# Call the Macro # Add include directories to all target
include_directories("Core/")
include_directories("Physics/")
include_directories("Online/")
# Call the macro
subdirlist(SUB_DIRECTORY ${CMAKE_BINARY_DIR}) subdirlist(SUB_DIRECTORY ${CMAKE_BINARY_DIR})
set(SUB_DIRECTORY ${SUB_DIRECTORY} Core Physics Calibration InitialConditions InteractionCoordinates Online Utility) set(SUB_DIRECTORY ${SUB_DIRECTORY} Core Physics Calibration InitialConditions InteractionCoordinates Online Utility)
# Add each sub folder to the project # Add each sub folder to the project
...@@ -106,15 +111,6 @@ foreach(subdir ${SUB_DIRECTORY}) ...@@ -106,15 +111,6 @@ foreach(subdir ${SUB_DIRECTORY})
endforeach() endforeach()
# Add include directories to all target
include_directories("Core/")
include_directories("Physics/")
include_directories("Online/")
include_directories("../Core/")
include_directories("../Physics/")
include_directories("../Online/")
export(TARGETS ${TARGET_LIST} FILE NPLibTargets.cmake) export(TARGETS ${TARGET_LIST} FILE NPLibTargets.cmake)
export(PACKAGE NPLib) export(PACKAGE NPLib)
file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" "${CMAKE_INCLUDE_OUTPUT_DIRECTORY}") file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" "${CMAKE_INCLUDE_OUTPUT_DIRECTORY}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment