Refactor cluster_tools CMakeLists

- Remove add_subdiretory in tools/CMakeLists.txt
- Add add_subdiretory in CMakeLists.txt
- Add test to install cluster_tools if CLITK_BUILD_TOOLS is ON

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f64d0aa47e916c08cc921752550312deb4004ca5..7bc48eb54f426638398215452f1ebd7dfcf7a7d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,3 +30,4 @@ ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/common ${PROJECT_BINARY_DIR}/common)
 ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
 ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/segmentation ${PROJECT_BINARY_DIR}/segmentation)
 ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/registration ${PROJECT_BINARY_DIR}/registration)
+ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/cluster_tools ${PROJECT_BINARY_DIR}/cluster_tools)

diff --git a/cluster_tools/CMakeLists.txt b/cluster_tools/CMakeLists.txt
index ed8288b36b3aab1be2a2842e7b73ba71403b3f0b..5ef6a060f4dd93ef9057dd9302d22307934a6a13 100644 (file)
--- a/cluster_tools/CMakeLists.txt
+++ b/cluster_tools/CMakeLists.txt
@@ -1,15 +1,18 @@
-#=========================================================
-# Install scripts when running make install
-SET(SCRIPTS
-  gate_job_cluster.job
-  gate_make_merge_release.sh
-  gate_make_release.sh
-  gate_power_merge.sh
-  gate_run_submit_cluster.sh
-  gate_upload_release.sh
-  mergeDosePerEnergyFile.sh
-  mergeStatFile.py
-  mergeStatFile.sh
-)
+IF (CLITK_BUILD_TOOLS)
+  #=========================================================
+  # Install scripts when running make install
+  SET(SCRIPTS
+    gate_job_cluster.job
+    gate_make_merge_release.sh
+    gate_make_release.sh
+    gate_power_merge.sh
+    gate_run_submit_cluster.sh
+    gate_upload_release.sh
+    mergeDosePerEnergyFile.sh
+    mergeStatFile.py
+    mergeStatFile.sh
+    )
 
-INSTALL (FILES ${SCRIPTS} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+  INSTALL (FILES ${SCRIPTS} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+
+ENDIF(CLITK_BUILD_TOOLS)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 7ab7971afd2bc79d5311893f8a7963898cbf859f..71afed68452fc840ccbadd37e500e57b08728106 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -27,10 +27,6 @@ ADD_LIBRARY(clitkMedianImageFilterLib clitkMedianImageGenericFilter.cxx ${clitkM
 #=========================================================
 IF (CLITK_BUILD_TOOLS)
 
-  #=========================================================
-  # install scripts
-  ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/cluster_tools ${PROJECT_BINARY_DIR}/cluster_tools)
-
   WRAP_GGO(clitkDicomInfo_GGO_C clitkDicomInfo.ggo)
   ADD_EXECUTABLE(clitkDicomInfo clitkDicomInfo.cxx ${clitkDicomInfo_GGO_C})
   TARGET_LINK_LIBRARIES(clitkDicomInfo clitkCommon)