Merge pull request #174 from InsightSoftwareConsortium/disable-elasti…

…x-tests COMP: Disable Elastix tests by default
InsightSoftwareConsortium · Nov 3, 2022 · c14e98d · c14e98d
2 parents 767dfb0 + 5f9406a
commit c14e98d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -5,8 +5,6 @@ on: [push,pull_request]
 jobs:
   cxx-build-workflow:
     uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@1d6a1d8b1176b6e0dbccb3cd3c47b015460ae988
-    with:
-      ctest-options: "-E \"elastix_run_example_COMPARE_IM|elastix_run_3DCT_lung.MI.bspline.ASGD.001_COMPARE_TP|elastix_run_3DCT_lung.NMI.bspline.ASGD.001_COMPARE_TP|TransformixTest\""
 
   python-build-workflow:
     uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@1d6a1d8b1176b6e0dbccb3cd3c47b015460ae988

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,10 +35,13 @@ endif()
 
 include(FetchContent)
 
+# Set up Elastix build parameters for populate step
+option(ELASTIX_BUILD_TESTING OFF)
 set(_itk_build_testing ${BUILD_TESTING})
-#set(BUILD_TESTING OFF)
+set(BUILD_TESTING ${ELASTIX_BUILD_TESTING})
 set(_itk_build_shared ${BUILD_SHARED_LIBS})
-set(BUILD_SHARED_LIBS OFF)
+set(BUILD_SHARED_LIBS OFF) # Elastix does not support shared libs
+
 set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
 set(elastix_GIT_TAG "9e6efb6f9aa3b3545c7365a4b2c97aa2f88a17b5")
 FetchContent_Declare(
@@ -76,6 +79,8 @@ endif()
 if(ELASTIX_USE_OPENCL)
   add_definitions(-DELASTIX_USE_OPENCL)
 endif()
+
+# Reset parameters for ITK remote module build
 set(BUILD_TESTING ${_itk_build_testing})
 set(BUILD_SHARED_LIBS ${_itk_build_shared})