Merge pull request InsightSoftwareConsortium#5793 from blowekamp/cmake_zlib_interface

Use CMake Interface Targets for ZLIB

Author: blowekamp

Examples/RegistrationITKv4/CMakeLists.txt

@@ -317,10 +317,29 @@ target_link_libraries(
 
 if(ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW)
   add_executable(DeformableRegistration9 DeformableRegistration9.cxx)
-  target_link_libraries(DeformableRegistration9 ${ITK_LIBRARIES})
+  target_link_libraries(
+    DeformableRegistration9
+    PRIVATE
+      ITK::ITKImageIO
+      ITK::ITKDisplacementFieldModule
+      ITK::ITKImageFilterBaseModule
+      ITK::ITKImageFunctionModule
+      ITK::ITKImageGridModule
+      ITK::ITKImageIntensityModule
+      ITK::ITKPDEDeformableRegistrationModule
+  )
 
   add_executable(DeformableRegistration10 DeformableRegistration10.cxx)
-  target_link_libraries(DeformableRegistration10 ${ITK_LIBRARIES})
+  target_link_libraries(
+    DeformableRegistration10
+    PRIVATE
+      ITK::ITKImageIO
+      ITK::ITKDisplacementFieldModule
+      ITK::ITKImageFilterBaseModule
+      ITK::ITKImageFunctionModule
+      ITK::ITKImageIntensityModule
+      ITK::ITKPDEDeformableRegistrationModule
+  )
 endif()
 
 add_executable(MultiResImageRegistration1 MultiResImageRegistration1.cxx)
@@ -399,10 +418,22 @@ target_link_libraries(
 
 if(ITKFEMRegistration_ENABLED)
   add_executable(DeformableRegistration1 DeformableRegistration1.cxx)
-  target_link_libraries(DeformableRegistration1 ${ITK_LIBRARIES})
+  target_link_libraries(
+    DeformableRegistration1
+    PRIVATE
+      ITK::ITKImageIO
+      ITK::ITKFEMRegistrationModule
+      ITK::ITKImageIntensityModule
+  )
 
   add_executable(DeformableRegistration11 DeformableRegistration11.cxx)
-  target_link_libraries(DeformableRegistration11 ${ITK_LIBRARIES})
+  target_link_libraries(
+    DeformableRegistration11
+    PRIVATE
+      ITK::ITKImageIO
+      ITK::ITKFEMRegistrationModule
+      ITK::ITKImageIntensityModule
+  )
 endif()
 
 add_executable(DeformableRegistration2 DeformableRegistration2.cxx)

Modules/ThirdParty/HDF5/src/CMakeLists.txt

@@ -239,9 +239,8 @@ endif()
 if(HDF5_ENABLE_Z_LIB_SUPPORT)
   # We must tell the main HDF5 library that it depends on our zlib
   # see src/itkhdf5/CMakeLists.txt for detauls
-  set(H5_ZLIB_INCLUDE_DIRS "${ITKZLIB_INCLUDE_DIRS}")
-  set(H5_ZLIB_LIBRARIES "${ITKZLIB_LIBRARIES}")
-  set(HDF5_LIB_DEPENDENCIES ${ITKZLIB_LIBRARIES})
+  set(H5_ZLIB_LIBRARIES "ITK::ITKZLIBModule")
+  set(HDF5_LIB_DEPENDENCIES ITK::ITKZLIBModule)
   set(H5_ZLIB_HEADER "itk_zlib.h")
 
   set(

Modules/ThirdParty/MINC/src/CMakeLists.txt

@@ -25,8 +25,7 @@ set(LIBMINC_BUILD_EZMINC_EXAMPLES OFF)
 set(LIBMINC_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(LIBMINC_EXPORTED_TARGETS ${ITKMINC-targets})
 
-set(ZLIB_INCLUDE_DIR ${ITKZLIB_INCLUDE_DIRS})
-set(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES})
+set(ZLIB_LIBRARY ITK::ITKZLIBModule)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})

Modules/ThirdParty/MetaIO/src/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(METAIO_NAMESPACE "ITKMetaIO")
 set(METAIO_PROJECT_NAME "ITK3P_MetaIO")
-set(METAIO_ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES})
+set(METAIO_ZLIB_LIBRARIES ITK::ITKZLIBModule)
 set(METAIO_INSTALL_EXPORT_NAME ${ITKMetaIO-targets})
 set(METAIO_INSTALL_INCLUDE_DIR ${ITKMetaIO_INSTALL_INCLUDE_DIR})
 set(METAIO_INSTALL_RUNTIME_DIR ${ITKMetaIO_INSTALL_RUNTIME_DIR})

Modules/ThirdParty/NIFTI/src/CMakeLists.txt

@@ -48,7 +48,7 @@ set(NIFTI_INSTALL_ARCHIVE_DIR "${ITKNIFTI_INSTALL_ARCHIVE_DIR}") # "Set nifti in
 
 set(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR}")
 
-set(NIFTI_ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES}) # "Set the zlib library associated with ITK"
+set(NIFTI_ZLIB_LIBRARIES ITK::ITKZLIBModule) # "Set the zlib library associated with ITK"
 # Modern CMake install COMPONENTS is being considered in upstream GIFTI
 # Setting METAIO_INSTALL_NO_DEVELOPMENT & METAIO_INSTALL_NO_LIBRARIES to
 # FALSE to make explicit that the development and libraries

Modules/ThirdParty/NrrdIO/src/CMakeLists.txt

@@ -10,9 +10,8 @@ set(NRRDIO_USE_ZLIB OFF)
 set(TEEM_ITK_MANGLE 1) # Needed to generate public facing ITKNrrdIO.h from ITKNrrdIO.h.in with TEEM_ITK_MANGLE=1 always
 add_definitions(-DTEEM_ITK_MANGLE=${TEEM_ITK_MANGLE}) # Needed for privateNrrd.h (only used when building library, no public api).
 add_definitions(-DTEEM_ZLIB=1) # Force setting zlib support here
-set(ZLIB_INCLUDE_DIR ${ITKZLIB_INCLUDE_DIRS})
-set(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES})
-list(APPEND NRRDIO_COMPRESSION_LIBRARIES ${ITKZLIB_LIBRARIES})
+set(ZLIB_LIBRARY ITK::ITKZLIBModule)
+list(APPEND NRRDIO_COMPRESSION_LIBRARIES ITK::ITKZLIBModule)
 if(UNIX)
   list(APPEND NRRDIO_COMPRESSION_LIBRARIES m)
   list(REMOVE_DUPLICATES NRRDIO_COMPRESSION_LIBRARIES)

Modules/ThirdParty/PNG/src/itkpng/CMakeLists.txt

@@ -36,7 +36,7 @@ configure_file(${ITK3P_PNG_SOURCE_DIR}/itk_png_mangle.h.in
                @ONLY)
 
 add_library(itkpng ${PNG_SRCS})
-target_link_libraries(itkpng ${ITKZLIB_LIBRARIES})
+target_link_libraries(itkpng ITK::ITKZLIBModule)
 
 target_include_directories(itkpng
   INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${ITK3P_INSTALL_INCLUDE_DIR}/itkpng>;$<BUILD_INTERFACE:${ITK3P_PNG_BINARY_DIR}>"

Modules/ThirdParty/TIFF/src/itktiff/libtiff/CMakeLists.txt

@@ -144,7 +144,7 @@ set(tiff_libs_private_list "") # cmake list
 set(tiff_requires_private "") # cmake string
 
 if(ZIP_SUPPORT)
-  target_link_libraries(itktiff PRIVATE ${ITKZLIB_LIBRARIES})
+  target_link_libraries(itktiff PRIVATE ITK::ITKZLIBModule)
   string(APPEND tiff_requires_private " zlib")
 endif()
 if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)

Modules/ThirdParty/ZLIB/CMakeLists.txt

@@ -8,12 +8,32 @@ option(
 )
 mark_as_advanced(ITK_USE_SYSTEM_ZLIB)
 
+# needed for the generated itk_zlib.h file
+set(ITKZLIB_INCLUDE_DIRS ${ITKZLIB_BINARY_DIR}/src)
+
 if(ITK_USE_SYSTEM_ZLIB)
   find_package(ZLIB REQUIRED)
   set(ITKZLIB_INCLUDE_DIRS ${ITKZLIB_BINARY_DIR}/src)
   set(ITKZLIB_SYSTEM_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
   set(ITKZLIB_LIBRARIES "${ZLIB_LIBRARIES}")
   set(ITKZLIB_NO_SRC 1)
+
+  set(
+    ITKZLIB_EXPORT_CODE_INSTALL
+    "
+  set(ZLIB_ROOT \"${ZLIB_ROOT}\")
+  find_package(ZLIB REQUIRED)
+  "
+  )
+  set(
+    ITKZLIB_EXPORT_CODE_BUILD
+    "
+  if(NOT ITK_BINARY_DIR)
+    set(ZLIB_ROOT \"${ZLIB_ROOT}\")
+    find_package(ZLIB REQUIRED)
+  endif()
+  "
+  )
 else()
   set(
     ITKZLIB_INCLUDE_DIRS