Skip to content

BUG: Add TBB bin dir to forward path #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 29, 2020
Merged

BUG: Add TBB bin dir to forward path #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ if(SlicerExecutionModel_USE_SERIALIZER)
set(GenerateCLP_USE_SERIALIZER ON)
endif()


#-----------------------------------------------------------------------------
# Note: The default values defined below could be overwritten if passed when configuring
# SlicerExecutionModel project.
Expand Down Expand Up @@ -177,6 +178,10 @@ endmacro()
endif()
###

SETIFEMPTY(SlicerExecutionModel_ADDITIONAL_FORWARD_PATHS_BUILD "" CACHE PATH "Specify additional forward build directory paths for GenerateCLPLauncher.")

SETIFEMPTY(SlicerExecutionModel_ADDITIONAL_FORWARD_PATHS_INSTALL "" CACHE PATH "Specify additional forward install directory paths for GenerateCLPLauncher.")

SETIFEMPTY(TCLAP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tclap CACHE PATH "Location of TCLAPConfig.cmake" FORCE)
add_subdirectory(tclap)

Expand All @@ -186,6 +191,9 @@ add_subdirectory(ModuleDescriptionParser)
SETIFEMPTY(GenerateCLP_DIR ${CMAKE_CURRENT_BINARY_DIR}/GenerateCLP CACHE PATH "Location of GenerateCLPConfig.cmake" FORCE)
add_subdirectory(GenerateCLP)




# --------------------------------------------------------------------------
# Set INCLUDE_DIRS variable
# --------------------------------------------------------------------------
Expand Down
19 changes: 19 additions & 0 deletions GenerateCLP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,22 @@ endif()
# where the binary is actually not in the same directory as the shared
# libraries it depends on.
#

#Add additional forward paths
set(additional_forward_paths_build "")
foreach(lib_path ${SlicerExecutionModel_ADDITIONAL_FORWARD_PATHS_BUILD})
string(APPEND additional_forward_paths_build
"\"${lib_path}\", "
)
endforeach()

set(additional_forward_paths_install "")
foreach(lib_path ${SlicerExecutionModel_ADDITIONAL_FORWARD_PATHS_INSTALL})
string(APPEND additional_forward_paths_install
"\"${lib_path}\", "
)
endforeach()

if(JsonCpp_FOUND)
get_filename_component(json_library_dir ${JsonCpp_LIBRARY} DIRECTORY)
set(json_forward_path_build
Expand All @@ -171,17 +187,20 @@ set(GenerateCLP_FORWARD_PATH_BUILD " \\
\".\" CONFIG_DIR_POST, \\
\"${ITK_DIR}/bin\" CONFIG_DIR_POST, \\
${json_forward_path_build} \\
${additional_forward_paths_build} \\
\"${ModuleDescriptionParser_DIR}/bin\" CONFIG_DIR_POST \\
")
set(GenerateCLP_FORWARD_PATH_INSTALL " \\
\".\", \\
\"${ITK_DIR}/bin\", \\
${json_forward_path_install} \\
${additional_forward_paths_install} \\
\"${ModuleDescriptionParser_DIR}/bin\" \\
")
set(GenerateCLP_FORWARD_EXE GenerateCLP)
set(GenerateCLP_FORWARD_DIR_INSTALL "..")


# --------------------------------------------------------------------------
# Build launcher
# --------------------------------------------------------------------------
Expand Down