ENH: NO zlib.

BRAINSia · Mar 11, 2023 · 4141f22 · 4141f22
1 parent fa804af
commit 4141f22
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/SuperBuild/External_DCMTK.cmake b/SuperBuild/External_DCMTK.cmake
@@ -2,7 +2,9 @@
 set(proj DCMTK)
 
 # Set dependency list
-set(${proj}_DEPENDENCIES "zlib")
+set(${proj}_DEPENDENCIES ""
+# "zlib"
+)
 
 # Include dependent projects if any
 ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)

diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake
@@ -3,7 +3,9 @@ set(proj ITKv5)
 set(${proj}_REQUIRED_VERSION 5.3)
 
 # Set dependency list
-set(${proj}_DEPENDENCIES "zlib")
+set(${proj}_DEPENDENCIES ""
+# "zlib"
+)
 if(${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB)
   list(APPEND ${proj}_DEPENDENCIES "TBB")
 endif()
@@ -161,6 +163,13 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       -DModule_ITKTBB:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB}
       -DTBB_DIR:PATH=${TBB_DIR}
       #INSTALL_COMMAND ""
+      -DITK_USE_FFTWF:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_FFTW}
+      -DITK_USE_FFTWD:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_FFTW}
+      -DITK_USE_GOLD_LINKER:BOOL=OFF ## RHEL7 fails to build GDCM with gold linker
+      # TBB
+      -DModule_ITKTBB:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB}
+      -DTBB_DIR:PATH=${TBB_DIR}
+      #INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}
     )

diff --git a/SuperBuild/External_OpenJPEG.cmake b/SuperBuild/External_OpenJPEG.cmake
@@ -12,7 +12,9 @@ if(DEFINED ${extProjName}_DIR AND NOT EXISTS ${${extProjName}_DIR})
 endif()
 
 # Set dependency list
-set(${proj}_DEPENDENCIES zlib)
+set(${proj}_DEPENDENCIES ""
+  #  "zlib"
+)
 
 # Include dependent projects if any
 ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)

diff --git a/SuperBuild/External_VTK.cmake b/SuperBuild/External_VTK.cmake
@@ -6,8 +6,10 @@ set(VTK_VERSION_MINOR 2)
 set(${proj}_REQUIRED_VERSION "9.2")  #If a required version is necessary, then set this, else leave blank
 
 # Set dependency list
-set(${proj}_DEPENDENCIES "zlib" )
-#"TBB")
+set(${proj}_DEPENDENCIES ""
+# "zlib"
+# "TBB"
+)
 
 # Include dependent projects if any
 ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)
@@ -107,10 +109,14 @@ if((NOT DEFINED VTK_DIR OR NOT DEFINED VTK_SOURCE_DIR) AND NOT ${CMAKE_PROJECT_N
       ${VTK_QT_ARGS}
       ${VTK_MAC_ARGS}
       # ZLIB
-      -D${proj}_USE_SYSTEM_ZLIB:BOOL=ON
-      -DZLIB_ROOT:PATH=${ZLIB_ROOT}
-      -DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR}
-      -DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
+      #-D${proj}_USE_SYSTEM_ZLIB:BOOL=ON
+      #-DZLIB_ROOT:PATH=${ZLIB_ROOT}
+      #-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR}
+      #-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
+      -D${proj}_USE_SYSTEM_ZLIB:BOOL=OFF
+      -DZLIB_ROOT:PATH=""
+      -DZLIB_INCLUDE_DIR:PATH=""
+      -DZLIB_LIBRARY:FILEPATH=""
       # TBB
       -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=Sequential
       #-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB

diff --git a/SuperBuild/External_teem.cmake b/SuperBuild/External_teem.cmake
@@ -2,7 +2,9 @@
 set(proj teem)
 
 # Set dependency list
-set(${proj}_DEPENDENCIES zlib)
+set(${proj}_DEPENDENCIES ""
+#zlib
+)
 if(NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_teem)
   list(APPEND teem_DEPENDENCIES ${VTK_EXTERNAL_NAME})
 endif()