Merge pull request #6497 from blowekamp/cmake_thirdparty_depends

blowekamp · web-flow · commit c0c1ccb64832 · 2026-06-24T18:49:11.000-04:00
ENH: Fix ThirdParty itk-module.cmake dependency declarations
diff --git a/Modules/ThirdParty/DCMTK/itk-module.cmake b/Modules/ThirdParty/DCMTK/itk-module.cmake
@@ -10,7 +10,7 @@ if(ITK_USE_SYSTEM_DCMTK)
 else()
   itk_module(
     ITKDCMTK
-    DEPENDS
+    PRIVATE_DEPENDS
       ITKZLIB
       ITKJPEG
       ITKTIFF
diff --git a/Modules/ThirdParty/HDF5/itk-module.cmake b/Modules/ThirdParty/HDF5/itk-module.cmake
@@ -5,4 +5,8 @@ href=\"http://www.hdfgroup.org/HDF5/\">HDF5</a> library.
 HDF5 is a data model, library, and file format for storing and managing data."
 )
 
-itk_module(ITKHDF5 DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
+if(ITK_USE_SYSTEM_HDF5)
+  itk_module(ITKHDF5 DESCRIPTION "${DOCUMENTATION}")
+else()
+  itk_module(ITKHDF5 PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
+endif()
diff --git a/Modules/ThirdParty/MINC/itk-module.cmake b/Modules/ThirdParty/MINC/itk-module.cmake
@@ -12,6 +12,7 @@ else()
     ITKMINC
     DEPENDS
       ITKHDF5
+    PRIVATE_DEPENDS
       ITKKWSys
       ITKZLIB
     DESCRIPTION "${DOCUMENTATION}"
diff --git a/Modules/ThirdParty/Netlib/CMakeLists.txt b/Modules/ThirdParty/Netlib/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(ITKNetlib)
 set(ITKNetlib_THIRD_PARTY 1)
 
-set(ITKNetlib_INCLUDE_DIRS ${ITKNetlib_BINARY_DIR})
 set(ITKNetlib_LIBRARIES itkNetlibSlatec)
 
 itk_module_impl()
diff --git a/Modules/ThirdParty/Netlib/itk-module.cmake b/Modules/ThirdParty/Netlib/itk-module.cmake
@@ -5,4 +5,4 @@ href=\"http://www.netlib.org/slatec/\">netlib slatec</a> routines.  They are
 used by the probability distributions in ITK."
 )
 
-itk_module(ITKNetlib DEPENDS ITKVNL DESCRIPTION "${DOCUMENTATION}")
+itk_module(ITKNetlib PRIVATE_DEPENDS ITKVNL DESCRIPTION "${DOCUMENTATION}")
diff --git a/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt b/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt
@@ -23,9 +23,9 @@ ADD_LIBRARY( itkNetlibSlatec
  )
 
 IF(ITK_USE_SYSTEM_VXL)
-  TARGET_LINK_LIBRARIES( itkNetlibSlatec v3p_netlib netlib)
+  TARGET_LINK_LIBRARIES( itkNetlibSlatec PRIVATE v3p_netlib netlib)
 ELSE(ITK_USE_SYSTEM_VXL)
-  TARGET_LINK_LIBRARIES( itkNetlibSlatec itkv3p_netlib )
+  TARGET_LINK_LIBRARIES( itkNetlibSlatec PRIVATE itkv3p_netlib )
 ENDIF(ITK_USE_SYSTEM_VXL)
 
 IF(ITK_LIBRARY_PROPERTIES)
diff --git a/Modules/ThirdParty/NrrdIO/itk-module.cmake b/Modules/ThirdParty/NrrdIO/itk-module.cmake
@@ -4,4 +4,4 @@ set(
 href=\"http://teem.sourceforge.net/nrrd/lib.html\">NRRD</a> image file format."
 )
 
-itk_module(ITKNrrdIO DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
+itk_module(ITKNrrdIO PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
diff --git a/Modules/ThirdParty/PNG/CMakeLists.txt b/Modules/ThirdParty/PNG/CMakeLists.txt
@@ -1,13 +1,6 @@
 project(ITKPNG)
 set(ITKPNG_THIRD_PARTY 1)
 
-option(
-  ITK_USE_SYSTEM_PNG
-  "Use system-installed png"
-  ${ITK_USE_SYSTEM_LIBRARIES}
-)
-mark_as_advanced(ITK_USE_SYSTEM_PNG)
-
 if(ITK_USE_SYSTEM_PNG)
   find_package(PNG REQUIRED)
   set(ITKPNG_INCLUDE_DIRS ${ITKPNG_BINARY_DIR}/src)
diff --git a/Modules/ThirdParty/PNG/itk-module-init.cmake b/Modules/ThirdParty/PNG/itk-module-init.cmake
@@ -0,0 +1,6 @@
+option(
+  ITK_USE_SYSTEM_PNG
+  "Use system-installed png"
+  ${ITK_USE_SYSTEM_LIBRARIES}
+)
+mark_as_advanced(ITK_USE_SYSTEM_PNG)
diff --git a/Modules/ThirdParty/PNG/itk-module.cmake b/Modules/ThirdParty/PNG/itk-module.cmake
@@ -5,4 +5,8 @@ href=\"http://www.libpng.org/pub/png/libpng.html/\">Portable Network Graphics
 (PNG)</a> image file format library."
 )
 
-itk_module(ITKPNG DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
+if(ITK_USE_SYSTEM_PNG)
+  itk_module(ITKPNG DESCRIPTION "${DOCUMENTATION}")
+else()
+  itk_module(ITKPNG PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")
+endif()
diff --git a/Modules/ThirdParty/TIFF/CMakeLists.txt b/Modules/ThirdParty/TIFF/CMakeLists.txt
@@ -1,13 +1,6 @@
 project(ITKTIFF)
 set(ITKTIFF_THIRD_PARTY 1)
 
-option(
-  ITK_USE_SYSTEM_TIFF
-  "Use system-installed tiff"
-  ${ITK_USE_SYSTEM_LIBRARIES}
-)
-mark_as_advanced(ITK_USE_SYSTEM_TIFF)
-
 if(ITK_USE_SYSTEM_TIFF)
   find_package(TIFF REQUIRED)
   set(
diff --git a/Modules/ThirdParty/TIFF/itk-module-init.cmake b/Modules/ThirdParty/TIFF/itk-module-init.cmake
@@ -0,0 +1,6 @@
+option(
+  ITK_USE_SYSTEM_TIFF
+  "Use system-installed tiff"
+  ${ITK_USE_SYSTEM_LIBRARIES}
+)
+mark_as_advanced(ITK_USE_SYSTEM_TIFF)
diff --git a/Modules/ThirdParty/TIFF/itk-module.cmake b/Modules/ThirdParty/TIFF/itk-module.cmake
@@ -5,10 +5,14 @@ href=\"http://www.libtiff.org/\">Tag Image File Format (TIFF)</a>
 image file format library."
 )
 
-itk_module(
-  ITKTIFF
-  DEPENDS
-    ITKZLIB
-    ITKJPEG
-  DESCRIPTION "${DOCUMENTATION}"
-)
+if(ITK_USE_SYSTEM_TIFF)
+  itk_module(ITKTIFF DESCRIPTION "${DOCUMENTATION}")
+else()
+  itk_module(
+    ITKTIFF
+    PRIVATE_DEPENDS
+      ITKZLIB
+      ITKJPEG
+    DESCRIPTION "${DOCUMENTATION}"
+  )
+endif()
diff --git a/Modules/ThirdParty/proxTV/itk-module.cmake b/Modules/ThirdParty/proxTV/itk-module.cmake
@@ -5,10 +5,14 @@ set(
 total variation proximity operators, for use by the TotalVariation module."
 )
 
-itk_module(
-  ITKproxTV
-  DEPENDS
-    ITKEigen3
-  DESCRIPTION "${DOCUMENTATION}"
-  EXCLUDE_FROM_DEFAULT
-)
+if(ITK_USE_SYSTEM_proxTV)
+  itk_module(ITKproxTV DESCRIPTION "${DOCUMENTATION}" EXCLUDE_FROM_DEFAULT)
+else()
+  itk_module(
+    ITKproxTV
+    DEPENDS
+      ITKEigen3
+    DESCRIPTION "${DOCUMENTATION}"
+    EXCLUDE_FROM_DEFAULT
+  )
+endif()

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,8 @@ href=\"http://www.hdfgroup.org/HDF5/\">HDF5</a> library.`
`5`	`5`	`HDF5 is a data model, library, and file format for storing and managing data."`
`6`	`6`	`)`
`7`	`7`
`8`		`-itk_module(ITKHDF5 DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
	`8`	`+if(ITK_USE_SYSTEM_HDF5)`
	`9`	`+ itk_module(ITKHDF5 DESCRIPTION "${DOCUMENTATION}")`
	`10`	`+else()`
	`11`	`+ itk_module(ITKHDF5 PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
	`12`	`+endif()`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ href=\"http://www.netlib.org/slatec/\">netlib slatec</a> routines. They are`
`5`	`5`	`used by the probability distributions in ITK."`
`6`	`6`	`)`
`7`	`7`
`8`		`-itk_module(ITKNetlib DEPENDS ITKVNL DESCRIPTION "${DOCUMENTATION}")`
	`8`	`+itk_module(ITKNetlib PRIVATE_DEPENDS ITKVNL DESCRIPTION "${DOCUMENTATION}")`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ set(`
`4`	`4`	`href=\"http://teem.sourceforge.net/nrrd/lib.html\">NRRD</a> image file format."`
`5`	`5`	`)`
`6`	`6`
`7`		`-itk_module(ITKNrrdIO DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
	`7`	`+itk_module(ITKNrrdIO PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,8 @@ href=\"http://www.libpng.org/pub/png/libpng.html/\">Portable Network Graphics`
`5`	`5`	`(PNG)</a> image file format library."`
`6`	`6`	`)`
`7`	`7`
`8`		`-itk_module(ITKPNG DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
	`8`	`+if(ITK_USE_SYSTEM_PNG)`
	`9`	`+ itk_module(ITKPNG DESCRIPTION "${DOCUMENTATION}")`
	`10`	`+else()`
	`11`	`+ itk_module(ITKPNG PRIVATE_DEPENDS ITKZLIB DESCRIPTION "${DOCUMENTATION}")`
	`12`	`+endif()`