ENH: require Scanco module for ISQ file support

Also simplify the ITK build a little
KitwareMedical · Apr 2, 2021 · 4a87ed1 · 4a87ed1
1 parent dcb646a
commit 4a87ed1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -60,12 +60,7 @@ jobs:
         cd ..
         mkdir ITK-build
         cd ITK-build
-        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
-        ninja
-        cd ..
-        mkdir ITKBoneEnhancement-build
-        cd ITKBoneEnhancement-build
-        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja -DITK_DIR=../ITK-build ../ITKBoneEnhancement
+        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_BoneEnhancement:BOOL=ON -DModule_IOScanco:BOOL=ON -GNinja ../ITK
         ninja
 
     - name: Build ITK
@@ -75,12 +70,7 @@ jobs:
         mkdir ITK-build
         cd ITK-build
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
-        ninja
-        cd ..
-        mkdir ITKBoneEnhancement-build
-        cd ITKBoneEnhancement-build
-        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja -DITK_DIR=../ITK-build ../ITKBoneEnhancement
+        cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_BoneEnhancement:BOOL=ON -DModule_IOScanco:BOOL=ON -GNinja ../ITK
         ninja
       shell: cmd
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -27,6 +27,7 @@ find_package(ITK 5 REQUIRED
     ITKSpatialObjects
     BoneEnhancement
     Cuberille
+    IOScanco
     ITKMesh
     ITKIOMeshBase
     ITKIOMeta

diff --git a/setup.py b/setup.py
@@ -45,6 +45,7 @@
     url=r'https://itk.org/',
     install_requires=[
         r'itk>=5.2rc3',
-        r'itk-boneenhancement'
+        r'itk-boneenhancement',
+        r'itk-ioscanco',
     ]
     )