ENH: Support remote and external building

Fixed / simplied paths and variable to support both building as an ITK remote module (via ITK / CMake) as well as building by pointing to a pre-compiled ITK.
InsightSoftwareConsortium · Mar 11, 2020 · ac4b205 · ac4b205
1 parent 0bff6cb
commit ac4b205
Show file tree

Hide file tree

Showing 65 changed files with 45 additions and 176 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,8 +135,12 @@ set( TubeTK_ITK_COMPONENTS
   ITKStatistics
   ITKTransform
   )
+
+####
+# Find ITK
+####
+find_package( ITK COMPONENTS ${TubeTK_ITK_COMPONENTS} REQUIRED )
 if( NOT ITK_SOURCE_DIR )
-  find_package( ITK COMPONENTS ${TubeTK_ITK_COMPONENTS} REQUIRED )
   mark_as_advanced( CLEAR ITK_DIR )
   if( NOT ITK_FOUND )
     find_package( ITK )
@@ -147,8 +151,8 @@ if( NOT ITK_SOURCE_DIR )
     set( ITK_DIR "NOT_FOUND" CACHE PATH
 	    "Path to ITK installation/build directory." FORCE )
   endif()
-  include( ${ITK_USE_FILE} )
 endif()
+include( ${ITK_USE_FILE} )
 
 ####
 # Find Python
@@ -259,48 +263,53 @@ set( TubeTKLib_INCLUDE_DIRS
   $<INSTALL_INTERFACE:include/TubeTKLib/Registration>
   $<INSTALL_INTERFACE:include/TubeTKLib/Segmentation> )
 
-set( TubeTKLib_LIBRARY_DIRS
-  ${TubeTK_BINARY_DIR}/bin
-  ${TubeTK_BINARY_DIR}/lib )
+#set( TubeTKLib_LIBRARY_DIRS
+  #${TubeTK_BINARY_DIR}/bin
+  #${TubeTK_BINARY_DIR}/lib )
 
 ####
 # TubeTK includes TubeTKLib's libraries and include directories
 ####
 set( TubeTK_LIBRARIES
-  TubeTK
   ${TubeTKLib_LIBRARIES} )
 
 set( TubeTK_INCLUDE_DIRS
-  ${TubeTK_SOURCE_DIR}/include
+  $<INSTALL_INTERFACE:include>
   ${TubeTKLib_INCLUDE_DIRS} )
 
-set( TubeTK_LIBRARY_DIRS
-  ${TubeTK_BINARY_DIR}/bin 
-  ${TubeTK_BINARY_DIR}/lib
-  ${TubeTK_EXECUTABLE_DIRS} )
+#set( TubeTK_LIBRARY_DIRS
+  #${TubeTK_BINARY_DIR}/bin 
+  #${TubeTK_BINARY_DIR}/lib
+  #${TubeTK_EXECUTABLE_DIRS} )
 
 set( TubeTK_SYSTEM_INCLUDE_DIRS ${TubeTK_INCLUDE_DIRS} )
-set( TubeTK_SYSTEM_LIBRARY_DIRS ${TubeTK_LIBRARY_DIRS} )
+#set( TubeTK_SYSTEM_LIBRARY_DIRS ${TubeTK_LIBRARY_DIRS} )
 
 ####
 # Build base library and optional components
 ####
-find_package( ITK COMPONENTS ${TubeTK_ITK_COMPONENTS} REQUIRED )
-include( ${ITK_USE_FILE} )
+include_directories(
+  ${TubeTK_SOURCE_DIR}/TubeTKLib
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/Common
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/Filtering
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/IO
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/MetaIO
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/Numerics
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/ObjectDocuments
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/Registration
+  ${TubeTK_SOURCE_DIR}/TubeTKLib/Segmentation )
+
 add_subdirectory( TubeTKLib )
 
-install( TARGETS ${TubeTKLib_LIBRARIES} EXPORT TubeTK-targets
+install( TARGETS ${TubeTKLib_LIBRARIES} EXPORT TubeTKLib-targets
   ARCHIVE DESTINATION lib )
 
-install( EXPORT TubeTK-targets DESTINATION lib/cmake )
+install( EXPORT TubeTKLib-targets DESTINATION lib/cmake )
 
 ####
 # Build ITK module
 ####
 if( NOT ITK_SOURCE_DIR )
-  # ITK has already been found (see above), so skip these two lines...
-  #   find_package( ITK COMPONENTS ${TubeTK_ITK_COMPONENTS} REQUIRED )
-  #   include( ${ITK_USE_FILE} )
   list( APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR} )
   include( ITKModuleExternal )
 else()

diff --git a/TubeTKLib/Filtering/CMakeLists.txt b/TubeTKLib/Filtering/CMakeLists.txt
@@ -116,11 +116,11 @@ endif()
 
 add_library( TubeTKLibFiltering INTERFACE )
 target_include_directories( TubeTKLibFiltering INTERFACE
-  ${ITK_INCLUDE_DIRS}
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
-  )
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>" )
 target_link_libraries( TubeTKLibFiltering INTERFACE
   TubeTKLibNumerics )
+include_directories(
+ ${ITK_INCLUDE_DIRS} )
 
 if( BUILD_TESTING )
   add_subdirectory( Testing )

diff --git a/TubeTKLib/Registration/CMakeLists.txt b/TubeTKLib/Registration/CMakeLists.txt
@@ -58,14 +58,16 @@ endif()
 add_library( TubeTKLibRegistration INTERFACE )
 
 target_include_directories( TubeTKLibRegistration INTERFACE
-  ${ITK_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR} )
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>" )
 
 target_link_libraries( TubeTKLibRegistration INTERFACE
   TubeTKLibFiltering
   TubeTKLibNumerics
   )
 
+include_directories(
+  ${ITK_INCLUDE_DIRS} )
+
 if( BUILD_TESTING )
   add_subdirectory( Testing )
 endif( BUILD_TESTING )

diff --git a/TubeTKLib/Segmentation/CMakeLists.txt b/TubeTKLib/Segmentation/CMakeLists.txt
@@ -68,9 +68,11 @@ endif()
 add_library( TubeTKLibSegmentation INTERFACE )
 
 target_include_directories( TubeTKLibSegmentation INTERFACE
-  ${ITK_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR} )
 
+include_directories(
+  ${ITK_INCLUDE_DIRS} )
+
 target_link_libraries( TubeTKLibSegmentation INTERFACE
    TubeTKLibIO
    TubeTKLibMetaIO

diff --git a/apps/AtlasBuilderUsingIntensity/CMakeLists.txt b/apps/AtlasBuilderUsingIntensity/CMakeLists.txt
@@ -44,7 +44,6 @@ SEMMacroBuildCLI(
   ADDITIONAL_SRCS tubeAtlasSummation.cxx
   LOGO_HEADER ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
     TubeTKLibObjectDocuments

diff --git a/apps/ComputeBinaryImageSimilarityMetrics/CMakeLists.txt b/apps/ComputeBinaryImageSimilarityMetrics/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
   )
 
 if( BUILD_TESTING )

diff --git a/apps/ComputeImageSimilarityMetrics/CMakeLists.txt b/apps/ComputeImageSimilarityMetrics/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
   )
 
 if( BUILD_TESTING )

diff --git a/apps/ComputeImageStatistics/CMakeLists.txt b/apps/ComputeImageStatistics/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
   )
 
 if( BUILD_TESTING )

diff --git a/apps/ComputeImageToTubeRigidMetricImage/CMakeLists.txt b/apps/ComputeImageToTubeRigidMetricImage/CMakeLists.txt
@@ -31,7 +31,6 @@ SEMMacroBuildCLI(
     ${ITK_LIBRARIES}
     ITKIOSpatialObjects
     ITKIOMeta
-    TubeTK
     TubeTKLibCommon
     TubeTKLibNumerics
   )

diff --git a/apps/ComputeRegionSignatures/CMakeLists.txt b/apps/ComputeRegionSignatures/CMakeLists.txt
@@ -29,6 +29,5 @@ SEMMacroBuildCLI(
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
     TubeTKCommon
   )
diff --git a/apps/ComputeSegmentTubesParameters/CMakeLists.txt b/apps/ComputeSegmentTubesParameters/CMakeLists.txt
@@ -28,11 +28,12 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects
     TubeTKLibCommon
+    TubeTKLibNumerics
+    TubeTKLibMetaIO
   )
 
 if( BUILD_TESTING )

diff --git a/apps/ComputeTrainingMask/CMakeLists.txt b/apps/ComputeTrainingMask/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/ComputeTubeFlyThroughImage/CMakeLists.txt b/apps/ComputeTubeFlyThroughImage/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/ComputeTubeGraphProbability/CMakeLists.txt b/apps/ComputeTubeGraphProbability/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
   )

diff --git a/apps/ComputeTubeGraphSimilarityKernelMatrix/CMakeLists.txt b/apps/ComputeTubeGraphSimilarityKernelMatrix/CMakeLists.txt
@@ -37,7 +37,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
   ADDITIONAL_SRCS

diff --git a/apps/ComputeTubeMeasures/CMakeLists.txt b/apps/ComputeTubeMeasures/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
   )

diff --git a/apps/ComputeTubeProbability/CMakeLists.txt b/apps/ComputeTubeProbability/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/ComputeTubeTortuosityMeasures/CMakeLists.txt b/apps/ComputeTubeTortuosityMeasures/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ${VTK_LIBRARIES}
     ITKIOMeta

diff --git a/apps/Convert4DImageTo3DImages/CMakeLists.txt b/apps/Convert4DImageTo3DImages/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
   )

diff --git a/apps/ConvertCSVToImages/CMakeLists.txt b/apps/ConvertCSVToImages/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
   )

diff --git a/apps/ConvertImagesToCSV/CMakeLists.txt b/apps/ConvertImagesToCSV/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     TubeTKLibCommon
     ITKIOSpatialObjects

diff --git a/apps/ConvertShrunkenSeedImageToList/CMakeLists.txt b/apps/ConvertShrunkenSeedImageToList/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
   )
 

diff --git a/apps/ConvertSpatialGraphToImage/CMakeLists.txt b/apps/ConvertSpatialGraphToImage/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
     TubeTKLibCommon
     TubeTKLibNumerics
   )

diff --git a/apps/ConvertTRE/CMakeLists.txt b/apps/ConvertTRE/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/ConvertTubesToDensityImage/CMakeLists.txt b/apps/ConvertTubesToDensityImage/CMakeLists.txt
@@ -28,11 +28,9 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects
-    TubeTK
   )
 
 if( BUILD_TESTING )

diff --git a/apps/ConvertTubesToImage/CMakeLists.txt b/apps/ConvertTubesToImage/CMakeLists.txt
@@ -28,11 +28,9 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects
-    TubeTK
     TubeTKLibCommon
   )
 

diff --git a/apps/ConvertTubesToSurface/CMakeLists.txt b/apps/ConvertTubesToSurface/CMakeLists.txt
@@ -39,7 +39,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ${VTK_LIBRARIES}
     ITKIOMeta

diff --git a/apps/ConvertTubesToTubeGraph/CMakeLists.txt b/apps/ConvertTubesToTubeGraph/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/ConvertTubesToTubeTree/CMakeLists.txt b/apps/ConvertTubesToTubeTree/CMakeLists.txt
@@ -28,7 +28,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER
     ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
-    TubeTK
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects

diff --git a/apps/CropImage/CMakeLists.txt b/apps/CropImage/CMakeLists.txt
@@ -27,7 +27,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
     TubeTKLibCommon )
 
 if( BUILD_TESTING )

diff --git a/apps/CropTubes/CMakeLists.txt b/apps/CropTubes/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${ITK_LIBRARIES}
     ITKIOMeta
     ITKIOSpatialObjects
-    TubeTK
     TubeTKLibCommon
   )
 

diff --git a/apps/DeblendTomosynthesisSlicesUsingPrior/CMakeLists.txt b/apps/DeblendTomosynthesisSlicesUsingPrior/CMakeLists.txt
@@ -29,7 +29,6 @@ SEMMacroBuildCLI(
     ${ITK_LIBRARIES}
     ITKMetaIO
     ITKOptimizers
-    TubeTK
     TubeTKLibCommon
   )
 

diff --git a/apps/EnhanceCoherenceAndEdgesUsingDiffusion/CMakeLists.txt b/apps/EnhanceCoherenceAndEdgesUsingDiffusion/CMakeLists.txt
@@ -27,7 +27,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
     TubeTKLibCommon
   )
 

diff --git a/apps/EnhanceCoherenceUsingDiffusion/CMakeLists.txt b/apps/EnhanceCoherenceUsingDiffusion/CMakeLists.txt
@@ -27,7 +27,6 @@ SEMMacroBuildCLI(
   LOGO_HEADER ${TubeTK_SOURCE_DIR}/docs/TubeTKLogo.h
   TARGET_LIBRARIES
     ${ITK_LIBRARIES}
-    TubeTK
     TubeTKLibCommon
   )