Skip to content

ENH: Uniformize the use of JsonCpp with VTK #80

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
Sep 7, 2016
Merged

ENH: Uniformize the use of JsonCpp with VTK #80

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
13 changes: 11 additions & 2 deletions GenerateCLP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,26 @@ endif()
# where the binary is actually not in the same directory as the shared
# libraries it depends on.
#
if(JsonCpp_FOUND)
get_filename_component(json_library_dir ${JsonCpp_LIBRARY} DIRECTORY)
set(json_forward_path_build
"\"${json_library_dir}\" CONFIG_DIR_POST, \\
\"${json_library_dir}\", \\"
)
set(json_forward_path_install "\"${json_library_dir}\", \\")
endif()

set(GenerateCLP_FORWARD_DIR_BUILD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
set(GenerateCLP_FORWARD_PATH_BUILD " \\
\".\" CONFIG_DIR_POST, \\
\"${ITK_DIR}/bin\" CONFIG_DIR_POST, \\
\"${JsonCpp_DIR}/src/lib_json\" CONFIG_DIR_POST, \\
${json_forward_path_build}
\"${ModuleDescriptionParser_DIR}/bin\" CONFIG_DIR_POST \\
")
set(GenerateCLP_FORWARD_PATH_INSTALL " \\
\".\", \\
\"${ITK_DIR}/bin\", \\
\"${JsonCpp_DIR}/src/lib_json\", \\
${json_forward_path_install}
\"${ModuleDescriptionParser_DIR}/bin\" \\
")
set(GenerateCLP_FORWARD_EXE GenerateCLP)
Expand Down
3 changes: 2 additions & 1 deletion GenerateCLP/GenerateCLPConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ set(GenerateCLP_USE_SERIALIZER "@GenerateCLP_USE_SERIALIZER@")
set(TCLAP_DIR "@TCLAP_DIR@")
set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR@")
set(ITK_DIR "@ITK_DIR_CONFIG@")
set(JsonCpp_DIR "@JsonCpp_DIR@")
set(JsonCpp_INCLUDE_DIR "@JsonCpp_INCLUDE_DIR@")
set(JsonCpp_LIBRARY "@JsonCpp_LIBRARY@")
set(ParameterSerializer_DIR "@ParameterSerializer_DIR@")

find_program(GENERATECLP_EXE
Expand Down
3 changes: 2 additions & 1 deletion GenerateCLP/Testing/CMake/GenerateCLPTestPrerequisites.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ set(generateclp_cmake_generator "@CMAKE_GENERATOR@")
set(GenerateCLP_BINARY_DIR "@GenerateCLP_BINARY_DIR@")

set(GenerateCLP_USE_JSONCPP @GenerateCLP_USE_JSONCPP@)
set(JsonCpp_DIR "@JsonCpp_DIR@")
set(JsonCpp_INCLUDE_DIR "@JsonCpp_INCLUDE_DIR@")
set(JsonCpp_LIBRARY "@JsonCpp_LIBRARY@")

set(JsonCpp_CMAKE_MODULE_PATH "@SlicerExecutionModel_SOURCE_DIR@/CMake")

Expand Down
3 changes: 2 additions & 1 deletion SlicerExecutionModelConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ endif()
set(ModuleDescriptionParser_DIR ${SlicerExecutionModel_DIR}/ModuleDescriptionParser)
set(GenerateCLP_DIR ${SlicerExecutionModel_DIR}/GenerateCLP)
set(TCLAP_DIR ${SlicerExecutionModel_DIR}/tclap)
set(JsonCpp_DIR "@JsonCpp_DIR@")
set(JsonCpp_INCLUDE_DIR "@JsonCpp_INCLUDE_DIR@")
set(JsonCpp_LIBRARY "@JsonCpp_LIBRARY@")
set(ParameterSerializer_DIR "@ParameterSerializer_DIR@")

#
Expand Down