InsightSoftwareConsortium · hjmjohnson · Nov 20, 2024 · Nov 19, 2024 · Nov 19, 2024 · Sep 11, 2024
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/CMakeLists.txt b/Modules/ThirdParty/TIFF/src/itktiff/CMakeLists.txt
@@ -24,24 +24,37 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(FALSE) # XXX(ITK): ITK handles CMake versions.
 cmake_minimum_required(VERSION 3.9.0)
 
 # Default policy is from 3.9.0
 cmake_policy(VERSION 3.9.0)
+endif()
 
 # Find CMake modules in cmake/
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
+if(FALSE) # XXX(ITK): We hard-code the TIFF version that we imported.
 # Read version information from configure.ac.
 include(AutotoolsVersion)
 message(STATUS "Building tiff version ${LIBTIFF_VERSION_FULL}")
+else()
+# Hard-code the version of TIFF used by ITK.
+set(LIBTIFF_MAJOR_VERSION 4)
+set(LIBTIFF_MINOR_VERSION 7)
+set(LIBTIFF_MICRO_VERSION 0)
+set(LIBTIFF_ALPHA_VERSION)
+set(LIBTIFF_VERSION "${LIBTIFF_MAJOR_VERSION}.${LIBTIFF_MINOR_VERSION}.${LIBTIFF_MICRO_VERSION}")
+set(LIBTIFF_VERSION_FULL "${LIBTIFF_VERSION}${LIBTIFF_ALPHA_VERSION}")
+endif()
 
 # Project definition
 set(CMAKE_C_STANDARD 99)
 project(tiff
         VERSION "${LIBTIFF_VERSION}"
         LANGUAGES C CXX)
 
+if(FALSE) # XXX(ITK): Suppress options not relevant to ITK.
 if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   # libtiff is being included as a subproject of some other project.
   set(TIFF_INSTALL_DEFAULT OFF)
@@ -56,6 +69,10 @@ option(tiff-contrib "build TIFF contrib" ON)
 option(tiff-docs "build TIFF documentation" ON)
 option(tiff-deprecated "build TIFF deprecated features" OFF)
 option(tiff-install "install TIFF targets" ${TIFF_INSTALL_DEFAULT})
+else()
+set(tiff-deprecated ON)
+set(tiff-install OFF)
+endif()
 
 # Disable deprecated features to ensure clean build
 if (tiff-deprecated)
@@ -85,8 +102,10 @@ include(GNUInstallDirs)
 # Documentation install directory (default to cmake project docdir)
 set(LIBTIFF_DOCDIR "${CMAKE_INSTALL_DOCDIR}")
 
+if(FALSE) # XXX(ITK): ITK handles testing
 # CTest testing
 enable_testing()
+endif()
 
 # Checks for type presence and size
 include(TypeSizeChecks)
@@ -137,12 +156,15 @@ include(LibraryFeatures)
 # math.h/libm portability
 find_package(CMath REQUIRED)
 
+if(FALSE) # XXX(ITK): We do not create TIFF releases.
 # Release support
 include(Release)
+endif()
 
 # Process subdirectories
 add_subdirectory(port)
 add_subdirectory(libtiff)
+return() # XXX(ITK): We do not need TIFF project infrastructure.
 if(tiff-tools)
   add_subdirectory(tools)
 endif()

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/CXXLibrary.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/CXXLibrary.cmake
@@ -23,6 +23,10 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(cxx 0)
+endif()
+
 # C++ support
 option(cxx "Enable C++ stream API building (requires C++ compiler)" ON)
 set(CXX_SUPPORT FALSE)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/CompilerChecks.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/CompilerChecks.cmake
@@ -23,6 +23,7 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+return() # XXX(ITK): We do not need TIFF project infrastructure.
 
 include(CheckCCompilerFlag)
 

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/DeflateCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/DeflateCodec.cmake
@@ -23,6 +23,12 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(ZLIB_SUPPORT TRUE)
+  set(ZIP_SUPPORT TRUE)
+  set(LIBDEFLATE_SUPPORT FALSE)
+  return()
+endif()
 
 # ZLIB
 set(ZLIB_SUPPORT FALSE)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/FindCMath.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/FindCMath.cmake
@@ -31,9 +31,10 @@ include(CheckSymbolExists)
 include(CheckLibraryExists)
 
 check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW)
-find_library(CMath_LIBRARY NAMES m)
 
 if(NOT CMath_HAVE_LIBC_POW)
+    find_library(CMath_LIBRARY NAMES m)
+    mark_as_advanced(CMath_LIBRARY)
     set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY})
     check_symbol_exists(pow "math.h" CMath_HAVE_LIBM_POW)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/InternalCodecs.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/InternalCodecs.cmake
@@ -23,6 +23,16 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(ccitt ON)
+  set(packbits ON)
+  set(lzw ON)
+  set(lze ON)
+  set(thunder ON)
+  set(next ON)
+  set(logluv ON)
+  set(mdi ON)
+endif()
 
 option(ccitt "support for CCITT Group 3 & 4 algorithms" ON)
 set(CCITT_SUPPORT ${ccitt})

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/JBIGCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/JBIGCodec.cmake
@@ -23,9 +23,9 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
-
 # JBIG-KIT
 set(JBIG_SUPPORT FALSE)
+return() # XXX(ITK): hard-code settings
 
 find_package(JBIG)
 

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/JPEGCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/JPEGCodec.cmake
@@ -23,6 +23,11 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(JPEG_SUPPORT TRUE)
+  set(OJPEG_SUPPORT FALSE)
+  return()
+endif()
 
 # JPEG
 set(JPEG_SUPPORT FALSE)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/LERCCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/LERCCodec.cmake
@@ -25,6 +25,7 @@
 
 # libLerc
 set(LERC_SUPPORT FALSE)
+return() # XXX(ITK): hard-code settings
 find_package(LERC)
 option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND})
 if (lerc AND LERC_FOUND AND ZIP_SUPPORT)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/LZMACodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/LZMACodec.cmake
@@ -26,6 +26,7 @@
 
 # liblzma2
 set(LZMA_SUPPORT FALSE)
+return() # XXX(ITK): hard-code settings
 find_package(liblzma)
 
 option(lzma "use liblzma (required for LZMA2 compression)" ${LIBLZMA_FOUND})

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/LibraryFeatures.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/LibraryFeatures.cmake
@@ -23,9 +23,18 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(strip-chopping 1)
+  set(defer-strile-load 0)
+  set(chunky-strip-read 0)
+  set(extrasample-as-alpha 0)
+  set(check-ycbcr-subsampling 0)
+endif()
+
 # Strip chopping
 option(strip-chopping "strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of specified size to reduce memory usage)" ON)
 set(TIFF_DEFAULT_STRIP_SIZE 8192 CACHE STRING "default size of the strip in bytes (when strip chopping is enabled)")
+mark_as_advanced(TIFF_DEFAULT_STRIP_SIZE) # XXX(ITK)
 
 set(STRIPCHOP_DEFAULT)
 if(strip-chopping)
@@ -36,6 +45,7 @@ if(strip-chopping)
 endif()
 
 set(TIFF_MAX_DIR_COUNT 1048576 CACHE STRING "Maximum number of TIFF directories that libtiff can browse through")
+mark_as_advanced(TIFF_MAX_DIR_COUNT) # XXX(ITK)
 
 # Defer loading of strip/tile offsets
 option(defer-strile-load "enable deferred strip/tile offset/size loading (also available at runtime with the 'D' flag of TIFFOpen())" OFF)

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/LinkerChecks.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/LinkerChecks.cmake
@@ -23,6 +23,7 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+return() # XXX(ITK): We do not need TIFF project infrastructure.
 
 include(CheckCSourceCompiles)
 

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/OpenGLChecks.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/OpenGLChecks.cmake
@@ -23,6 +23,11 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(OPENGL_SUPPORT FALSE)
+  return()
+endif()
+
 # OpenGL and GLUT
 set(OpenGL_GL_PREFERENCE LEGACY)
 

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/PixarLogCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/PixarLogCodec.cmake
@@ -23,6 +23,9 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  set(pixarlog 1)
+endif()
 
 # Option for Pixar log-format algorithm
 # Pixar log format

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/WebPCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/WebPCodec.cmake
@@ -25,6 +25,7 @@
 
 # libwebp
 set(WEBP_SUPPORT FALSE)
+return() # XXX(ITK): hard-code settings
 
 find_package(WebP)
 

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/WindowsSupport.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/WindowsSupport.cmake
@@ -23,6 +23,15 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
+if(TRUE) # XXX(ITK): hard-code settings
+  if(WIN32)
+    set(USE_WIN32_FILEIO ON)
+  else()
+    set(USE_WIN32_FILEIO OFF)
+  endif()
+  return()
+endif()
+
 if(MSVC)
     # Debug postfix
     set(CMAKE_DEBUG_POSTFIX "d")

diff --git a/Modules/ThirdParty/TIFF/src/itktiff/cmake/ZSTDCodec.cmake b/Modules/ThirdParty/TIFF/src/itktiff/cmake/ZSTDCodec.cmake
@@ -23,11 +23,12 @@
 # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 # OF THIS SOFTWARE.
 
-
 # libzstd
 set(ZSTD_SUPPORT FALSE)
 set(ZSTD_USABLE FALSE)
 
+return() # XXX(ITK): hard-code settings
+
 find_package(ZSTD)
 
 if(ZSTD_FOUND)