BUG: Building tests fails on github workflow machines (#153)

* ENH: Revert to standard cmake settings * ENH: Force module build to use shared libs * BUG: Use Python3_EXECUTABLE instead of PYTHON_EXECUTABLE * ENH: Also build static libs * ENH: Build static libs for itk and module * ENH: Force shared libs only * ENH: Enable Shared in itk-module * ENH: Test module required for development, not just testing * ENH: ITKTest module is a top-level and test-level dependency * ENH: testing * ENH: Bump setup.py to 5.4rc2
InsightSoftwareConsortium · Jan 12, 2024 · 454586b · 454586b
1 parent 0b68ed1
commit 454586b
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 30 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -6,7 +6,6 @@ jobs:
   cxx-build-workflow:
     uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@3f63de316255a285b0cac4c819d3d45649738999
     with:
-      itk-cmake-options: '-DBUILD_STATIC_LIBS:BOOL=ON'
       itk-module-deps: 'MinimalPathExtraction@35dd8e83b7df2059876e6835a5741eb3d45973bf'
 
   python-build-workflow:

diff --git a/itk-module.cmake b/itk-module.cmake
@@ -23,6 +23,7 @@ set( DOCUMENTATION
 "TubeTK provides methods for extracting, registering, and quantifying the shape of tubular structures (e.g., vessels, nerves, bones, roads) in 2D and 3D images (e.g., from MRI, CT, ultrasound, or satelite imaging).")
 
 itk_module( TubeTK
+  ENABLE_SHARED
   DEPENDS
     ITKCommon
     ITKFFT
@@ -35,8 +36,9 @@ itk_module( TubeTK
     ITKSmoothing
     ITKStatistics
     ITKSpatialObjects
-    ITKTransform
     ITKThresholding
+    ITKTransform
+    ITKTestKernel
     MinimalPathExtraction
   COMPILE_DEPENDS
     ITKAnisotropicSmoothing
@@ -55,6 +57,8 @@ itk_module( TubeTK
     ITKPDEDeformableRegistration
     ITKRegistrationCommon
     ITKTestKernel
+  TEST_DEPENDS
+    ITKTestKernel
   DESCRIPTION
     "${DOCUMENTATION}"
   EXCLUDE_FROM_DEFAULT

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@
         },
     install_requires=[
         r'numpy',
-        r'itk>=5.3.0',
+        r'itk>=5.4rc2',
         r'itk-minimalpathextraction>=1.2.6'
     ]
     )
diff --git a/test/CompareTools/CMakeLists.txt b/test/CompareTools/CMakeLists.txt
@@ -24,12 +24,6 @@ CreateTestDriver( tubeCompareImages
   "${TubeTK-Test_LIBRARIES}"
   CompareImages.cxx )
 
-add_dependencies( tubeCompareImagesTestDriver
-  ${TubeTK_LIBRARIES} )
-
 CreateTestDriver( tubeCompareTextFiles
   "${TubeTK-Test_LIBRARIES}"
   CompareTextFiles.cxx )
-
-add_dependencies( tubeCompareTextFilesTestDriver
-  ${TubeTK_LIBRARIES} )
diff --git a/test/Filtering/CMakeLists.txt b/test/Filtering/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-TubeTKFiltering ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-TubeTKFiltering ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/Filtering )
-endif( PYTHON_EXECUTABLE )
+endif( Python3_EXECUTABLE )
 
 CreateTestDriver( tubeFilteringHeader
   "${TubeTK-Test_LIBRARIES}"

diff --git a/test/IO/CMakeLists.txt b/test/IO/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-TubeTKIO ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-TubeTKIO ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/IO )
-endif( PYTHON_EXECUTABLE )
+endif( Python3_EXECUTABLE )
 
 CreateTestDriver( tubeIOHeader
   "${TubeTK-Test_LIBRARIES}"

diff --git a/test/MetaIO/CMakeLists.txt b/test/MetaIO/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-MetaIO ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-MetaIO ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/MetaIO )
-endif( PYTHON_EXECUTABLE )
+endif( Python3_EXECUTABLE )
 
 CreateTestDriver( tubeMetaIOHeader
   "${TubeTK-Test_LIBRARIES}"

diff --git a/test/Numerics/CMakeLists.txt b/test/Numerics/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  add_test( PrintSelf-Numerics ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  add_test( PrintSelf-Numerics ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/TubeTKLib/Numerics )
-endif()
+endif( Python3_EXECUTABLE )
 
 set( tubeNumericsTests_SRCS
   tubeNumericsPrintTest.cxx

diff --git a/test/ObjectDocuments/CMakeLists.txt b/test/ObjectDocuments/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-ObjectDocuments ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-ObjectDocuments ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/ObjectDocuments )
-endif( PYTHON_EXECUTABLE )
+endif( Python3_EXECUTABLE )
 
 set( tubeObjectDocumentsTests_SRCS
   tubeObjectDocumentsPrintTest.cxx )

diff --git a/test/Registration/CMakeLists.txt b/test/Registration/CMakeLists.txt
@@ -20,11 +20,11 @@
 #
 ##############################################################################
 
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-Registration ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-Registration ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/Registration )
-endif( PYTHON_EXECUTABLE )
+endif( Python3_EXECUTABLE )
 
 CreateTestDriver( tubeRegistrationHeader
   "${TubeTK-Test_LIBRARIES}"

diff --git a/test/Segmentation/CMakeLists.txt b/test/Segmentation/CMakeLists.txt
@@ -21,11 +21,11 @@
 ##############################################################################
 
 find_package( Python )
-if( PYTHON_EXECUTABLE )
-  itk_add_test( PrintSelf-TubeTKSegmentation ${PYTHON_EXECUTABLE}
+if( Python3_EXECUTABLE )
+  itk_add_test( PrintSelf-TubeTKSegmentation ${Python3_EXECUTABLE}
     ${TubeTK_SOURCE_DIR}/CMake/PrintSelfCheck.py
     ${TubeTK_SOURCE_DIR}/src/Segmentation )
-endif()
+endif( Python3_EXECUTABLE )
 
 CreateTestDriver( tubeSegmentationHeader
   "${TubeTK-Test_LIBRARIES}"