Skip to content

Commit

Permalink
BUG: Fixed example pipeline installation when creating Anaconda packa…
Browse files Browse the repository at this point in the history
…ge (#846)

Signed-off-by: Jared Duffey <[email protected]>
  • Loading branch information
JDuffeyBQ authored Feb 2, 2024
1 parent 62e6ece commit c265d60
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ if(SIMPLNX_BUILD_TESTS AND SIMPLNX_DOWNLOAD_TEST_FILES)
set_target_properties(Fetch_Remote_Data_Files PROPERTIES FOLDER ZZ_FETCH_TEST_FILES)
endif()

if(SIMPLNX_CONDA_BUILD)
include(GNUInstallDirs)
set(SIMPLNX_PIPELINE_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/simplnx/pipelines")
else()
set(SIMPLNX_PIPELINE_INSTALL_DIR "pipelines")
endif()

# -----------------------------------------------------------------------
# Find dependent libraries
# -----------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,15 @@
},
"SimplnxCore_INSTALL_PIPELINES": {
"type": "BOOL",
"value": "OFF"
"value": "ON"
},
"ITKImageProcessing_INSTALL_PIPELINES": {
"type": "BOOL",
"value": "OFF"
"value": "ON"
},
"OrientationAnalysis_INSTALL_PIPELINES": {
"type": "BOOL",
"value": "OFF"
"value": "ON"
},
"OrientationAnalysis_INSTALL_DATA_FILES": {
"type": "BOOL",
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/ITKImageProcessing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ if(EXISTS "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines")
option(${PLUGIN_NAME}_INSTALL_PIPELINES "Enables install of ${PLUGIN_NAME} pipelines" ON)

if(${PLUGIN_NAME}_INSTALL_PIPELINES)
set(INSTALL_DESTINATION "pipelines/${PLUGIN_NAME}")
set(INSTALL_DESTINATION "${SIMPLNX_PIPELINE_INSTALL_DIR}/${PLUGIN_NAME}")
install(DIRECTORY
"${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/"
DESTINATION "${INSTALL_DESTINATION}"
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ if(EXISTS "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines")
option(${PLUGIN_NAME}_INSTALL_PIPELINES "Enables install of ${PLUGIN_NAME} pipelines" ON)

if(${PLUGIN_NAME}_INSTALL_PIPELINES)
set(INSTALL_DESTINATION "pipelines/${PLUGIN_NAME}")
set(INSTALL_DESTINATION "${SIMPLNX_PIPELINE_INSTALL_DIR}/${PLUGIN_NAME}")
install(DIRECTORY
"${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/"
DESTINATION "${INSTALL_DESTINATION}"
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/SimplnxCore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ if(EXISTS "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines")
option(${PLUGIN_NAME}_INSTALL_PIPELINES "Enables install of ${PLUGIN_NAME} pipelines" ON)

if(${PLUGIN_NAME}_INSTALL_PIPELINES)
set(INSTALL_DESTINATION "pipelines/${PLUGIN_NAME}")
set(INSTALL_DESTINATION "${SIMPLNX_PIPELINE_INSTALL_DIR}/${PLUGIN_NAME}")
install(DIRECTORY
"${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/"
DESTINATION "${INSTALL_DESTINATION}"
Expand Down

0 comments on commit c265d60

Please sign in to comment.