Merge pull request #5772 from blowekamp/cmake_updates

dzenanz · web-flow · commit 224cad4541bb · 2026-02-06T12:48:01.000-05:00
diff --git a/CMake/ITKModuleTest.cmake b/CMake/ITKModuleTest.cmake
@@ -81,7 +81,7 @@ EM_ASM(
   )
   target_link_libraries(
     ${KIT}TestDriver
-    LINK_PUBLIC
+    PUBLIC
       ${KIT_LIBS}
       ${ITKTestKernel_LIBRARIES}
   )
diff --git a/CMake/itkExternal_Eigen3.cmake b/CMake/itkExternal_Eigen3.cmake
@@ -21,12 +21,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
   )
 endif()
 
-if(CMAKE_SH AND CMAKE_VERSION VERSION_LESS "3.17.0")
-  # Setting CMAKE_SH is required when using "MinGW Makefiles" generator with CMake < 3.17
-  # See https://github.com/InsightSoftwareConsortium/ITK/issues/66#issuecomment-424374973
-  list(APPEND _additional_external_project_args -DCMAKE_SH:PATH=${CMAKE_SH})
-endif()
-
 # Because the header-only nature of Eigen3, EIGEN_MPL2_ONLY definition could be leaked outside ITK.
 # This would wrongly enforce EIGEN_MPL2_ONLY to other libraries using Eigen.
 # We wrap this definition in ITK_USE_EIGEN_MPL2_ONLY, and only enabling it internally in the dashboards and CI,
diff --git a/Modules/Core/Common/src/CMakeLists.txt b/Modules/Core/Common/src/CMakeLists.txt
@@ -242,7 +242,7 @@ endif()
 ### generating libraries
 itk_module_add_library(ITKCommon ${ITKCommon_SRCS})
 
-target_link_libraries(ITKCommon LINK_PUBLIC itksys)
+target_link_libraries(ITKCommon PUBLIC itksys)
 
 if(UNIX)
   target_link_libraries(
diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt
@@ -220,7 +220,7 @@ target_link_options(
     "$<$<AND:$<C_COMPILER_ID:AppleClang>,$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,15.0>>:LINKER:-no_warn_duplicate_libraries>"
 )
 itk_module_target_label(itkMathTest)
-target_link_libraries(itkMathTest LINK_PUBLIC ${ITKCommon-Test_LIBRARIES})
+target_link_libraries(itkMathTest PUBLIC ${ITKCommon-Test_LIBRARIES})
 itk_add_test(NAME itkMathTest COMMAND itkMathTest)
 
 add_executable(itkSystemInformation itkSystemInformation.cxx)
@@ -1843,8 +1843,8 @@ if(ITK_BUILD_SHARED_LIBS AND ITK_DYNAMIC_LOADING)
   buildclienttestlibrary(A SHARED)
   buildclienttestlibrary(B MODULE)
   buildclienttestlibrary(C SHARED)
-  target_link_libraries(ITKCommon2TestDriver LINK_PUBLIC ClientTestLibraryA)
-  target_link_libraries(ITKCommon2TestDriver LINK_PUBLIC ClientTestLibraryC)
+  target_link_libraries(ITKCommon2TestDriver PUBLIC ClientTestLibraryA)
+  target_link_libraries(ITKCommon2TestDriver PUBLIC ClientTestLibraryC)
   itk_add_test(
     NAME itkDownCastTest
     COMMAND
diff --git a/Modules/Core/GPUCommon/src/CMakeLists.txt b/Modules/Core/GPUCommon/src/CMakeLists.txt
@@ -16,5 +16,5 @@ if(ITK_USE_GPU)
   write_gpu_kernels("${ITKGPUCommon_Kernels}" ITKGPUCommon_SRCS)
 
   itk_module_add_library(ITKGPUCommon ${ITKGPUCommon_SRCS})
-  target_link_libraries(ITKGPUCommon LINK_PUBLIC OpenCL::OpenCL)
+  target_link_libraries(ITKGPUCommon PUBLIC OpenCL::OpenCL)
 endif()
diff --git a/Modules/Core/TestKernel/src/CMakeLists.txt b/Modules/Core/TestKernel/src/CMakeLists.txt
@@ -10,7 +10,7 @@ itk_module_add_library(ITKTestKernel ${ITKTestKernel_SRCS})
 
 if(NOT DO_NOT_BUILD_ITK_TEST_DRIVER)
   add_executable(itkTestDriver itkTestDriver.cxx)
-  target_link_libraries(itkTestDriver LINK_PRIVATE ${ITKTestKernel_LIBRARIES})
+  target_link_libraries(itkTestDriver PRIVATE ${ITKTestKernel_LIBRARIES})
 
   itk_module_target_label(itkTestDriver)
   itk_module_target_export(itkTestDriver)
diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt
@@ -18,20 +18,20 @@ if(ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW)
   if(ITK_USE_FFTWD)
     if(NOT ITK_USE_SYSTEM_FFTW)
       add_dependencies(ITKFFT fftwd) # Ensure that local FFTW is built before using
-      target_link_libraries(ITKFFT LINK_PUBLIC ${ITK_FFTWD_LIBRARIES_NAMES})
+      target_link_libraries(ITKFFT PUBLIC ${ITK_FFTWD_LIBRARIES_NAMES})
     else()
       target_include_directories(ITKFFT PUBLIC ${FFTW_INCLUDE})
-      target_link_libraries(ITKFFT LINK_PUBLIC ${FFTWD_LIBRARIES})
+      target_link_libraries(ITKFFT PUBLIC ${FFTWD_LIBRARIES})
     endif()
   endif()
 
   if(ITK_USE_FFTWF)
     if(NOT ITK_USE_SYSTEM_FFTW)
       add_dependencies(ITKFFT fftwf) # Esnsure that local FFTW is build before using
-      target_link_libraries(ITKFFT LINK_PUBLIC ${ITK_FFTWF_LIBRARIES_NAMES})
+      target_link_libraries(ITKFFT PUBLIC ${ITK_FFTWF_LIBRARIES_NAMES})
     else()
       target_include_directories(ITKFFT PUBLIC ${FFTW_INCLUDE})
-      target_link_libraries(ITKFFT LINK_PUBLIC ${FFTWF_LIBRARIES})
+      target_link_libraries(ITKFFT PUBLIC ${FFTWF_LIBRARIES})
     endif()
   endif()
 endif()
diff --git a/Modules/IO/ImageBase/test/CMakeLists.txt b/Modules/IO/ImageBase/test/CMakeLists.txt
@@ -918,7 +918,7 @@ if(ITK_BUILD_SHARED_LIBS)
   )
   add_library(FileFreeTestLib MODULE ${FileFreeTest_Source})
   itk_module_target_label(FileFreeTestLib)
-  target_link_libraries(FileFreeTestLib LINK_PUBLIC ${ITKIOImageBase_LIBRARIES})
+  target_link_libraries(FileFreeTestLib PUBLIC ${ITKIOImageBase_LIBRARIES})
   set_property(
     TARGET
       FileFreeTestLib
diff --git a/Modules/IO/NIFTI/test/CMakeLists.txt b/Modules/IO/NIFTI/test/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(ITKIONIFTI-TestSupport itkNiftiImageIOTestHelper.cxx)
 itk_module_target_label(ITKIONIFTI-TestSupport)
 target_link_libraries(
   ITKIONIFTI-TestSupport
-  LINK_PUBLIC
+  PUBLIC
     ${ITKIONIFTI-Test_LIBRARIES}
 )
 
diff --git a/Modules/IO/TransformMINC/test/CMakeLists.txt b/Modules/IO/TransformMINC/test/CMakeLists.txt
@@ -15,11 +15,7 @@ set(
 )
 
 createtestdriver(ITKIOTransformMINC "${ITKIOTransformMINC-Test_LIBRARIES}" "${ITKIOTransformMINCTests}")
-target_link_libraries(
-  ITKIOTransformMINCTestDriver
-  LINK_PUBLIC
-    ITKIOTransformBase
-)
+target_link_libraries(ITKIOTransformMINCTestDriver PUBLIC ITKIOTransformBase)
 
 itk_add_test(
   NAME itkIOTransformMINCTest
diff --git a/Modules/Nonunit/IntegratedTest/test/CMakeLists.txt b/Modules/Nonunit/IntegratedTest/test/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_options(
 itk_module_target_label(itkAlgorithmsPrintTest)
 target_link_libraries(
   itkAlgorithmsPrintTest
-  LINK_PUBLIC
+  PUBLIC
     ${ITKIntegratedTest-Test_LIBRARIES}
 )
 itk_add_test(NAME itkAlgorithmsPrintTest COMMAND itkAlgorithmsPrintTest)
@@ -40,7 +40,7 @@ target_link_options(
 itk_module_target_label(itkAlgorithmsPrintTest2)
 target_link_libraries(
   itkAlgorithmsPrintTest2
-  LINK_PUBLIC
+  PUBLIC
     ${ITKIntegratedTest-Test_LIBRARIES}
 )
 itk_add_test(NAME itkAlgorithmsPrintTest2 COMMAND itkAlgorithmsPrintTest)
@@ -54,7 +54,7 @@ target_link_options(
 itk_module_target_label(itkAlgorithmsPrintTest3)
 target_link_libraries(
   itkAlgorithmsPrintTest3
-  LINK_PUBLIC
+  PUBLIC
     ${ITKIntegratedTest-Test_LIBRARIES}
 )
 itk_add_test(NAME itkAlgorithmsPrintTest3 COMMAND itkAlgorithmsPrintTest)
@@ -68,7 +68,7 @@ target_link_options(
 itk_module_target_label(itkAlgorithmsPrintTest4)
 target_link_libraries(
   itkAlgorithmsPrintTest4
-  LINK_PUBLIC
+  PUBLIC
     ${ITKIntegratedTest-Test_LIBRARIES}
 )
 itk_add_test(NAME itkAlgorithmsPrintTest4 COMMAND itkAlgorithmsPrintTest)
diff --git a/Modules/Numerics/FEM/src/CMakeLists.txt b/Modules/Numerics/FEM/src/CMakeLists.txt
@@ -50,4 +50,4 @@ set(
 )
 
 itk_module_add_library(ITKFEM ${ITKFEM_SRCS})
-target_link_libraries(ITKFEM LINK_PUBLIC ${ITKMetaIO_LIBRARIES})
+target_link_libraries(ITKFEM PUBLIC ${ITKMetaIO_LIBRARIES})
diff --git a/Modules/Numerics/Optimizers/src/CMakeLists.txt b/Modules/Numerics/Optimizers/src/CMakeLists.txt
@@ -33,4 +33,4 @@ set(
 )
 
 itk_module_add_library(ITKOptimizers ${ITKOptimizers_SRCS})
-target_link_libraries(ITKOptimizers LINK_PUBLIC ${ITKTransform_LIBRARIES})
+target_link_libraries(ITKOptimizers PUBLIC ${ITKTransform_LIBRARIES})
diff --git a/Modules/Numerics/Optimizersv4/src/CMakeLists.txt b/Modules/Numerics/Optimizersv4/src/CMakeLists.txt
@@ -13,4 +13,4 @@ set(
 )
 
 itk_module_add_library(ITKOptimizersv4 ${ITKOptimizersv4_SRCS})
-target_link_libraries(ITKOptimizersv4 LINK_PUBLIC ${ITKMetricsv4_LIBRARIES})
+target_link_libraries(ITKOptimizersv4 PUBLIC ${ITKMetricsv4_LIBRARIES})
diff --git a/Modules/ThirdParty/DCMTK/CMakeLists.txt b/Modules/ThirdParty/DCMTK/CMakeLists.txt
@@ -286,13 +286,8 @@ endforeach()
       ${ITKDCMTK_LIBDEP} )
   endforeach()
 
-  if(CMAKE_VERSION VERSION_LESS 3.4)
-    set(CMAKE_CXX_COMPILER_LAUNCHER_FLAG )
-    set(CMAKE_C_COMPILER_LAUNCHER_FLAG )
-  else()
-    set(CMAKE_CXX_COMPILER_LAUNCHER_FLAG -DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER})
-    set(CMAKE_C_COMPILER_LAUNCHER_FLAG -DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER})
-  endif()
+  set(CMAKE_CXX_COMPILER_LAUNCHER_FLAG -DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER})
+  set(CMAKE_C_COMPILER_LAUNCHER_FLAG -DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER})
   set(_cross_compiling_flags)
   if(CMAKE_TOOLCHAIN_FILE)
     list(APPEND _cross_compiling_flags -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE})
diff --git a/Modules/Video/BridgeVXL/src/CMakeLists.txt b/Modules/Video/BridgeVXL/src/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(ITKVideoBridgeVXL ${ITKVideoBridgeVXL_SRC})
 itk_module_link_dependencies()
 target_link_libraries(
   ITKVideoBridgeVXL
-  LINK_PUBLIC
+  PUBLIC
     vidl
     vul
 )
diff --git a/Wrapping/macro_files/itk_end_wrap_module.cmake b/Wrapping/macro_files/itk_end_wrap_module.cmake
@@ -550,7 +550,7 @@ ${DO_NOT_WAIT_FOR_THREADS_CALLS}
     endif()
 
     # Link the modules together
-    target_link_libraries(${lib} LINK_PUBLIC ${WRAPPER_LIBRARY_LINK_LIBRARIES})
+    target_link_libraries(${lib} PUBLIC ${WRAPPER_LIBRARY_LINK_LIBRARIES})
 
     # Set IPO if it is supported (check is done once globally in Wrapping/CMakeLists.txt)
     if(NOT MSVC AND ITK_WRAP_IPO_SUPPORTED)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ EM_ASM(`
`81`	`81`	`)`
`82`	`82`	`target_link_libraries(`
`83`	`83`	`${KIT}TestDriver`
`84`		`- LINK_PUBLIC`
	`84`	`+ PUBLIC`
`85`	`85`	`${KIT_LIBS}`
`86`	`86`	`${ITKTestKernel_LIBRARIES}`
`87`	`87`	`)`
Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,7 @@ if(ITK_BUILD_SHARED_LIBS)`
`918`	`918`	`)`
`919`	`919`	`add_library(FileFreeTestLib MODULE ${FileFreeTest_Source})`
`920`	`920`	`itk_module_target_label(FileFreeTestLib)`
`921`		`- target_link_libraries(FileFreeTestLib LINK_PUBLIC ${ITKIOImageBase_LIBRARIES})`
	`921`	`+ target_link_libraries(FileFreeTestLib PUBLIC ${ITKIOImageBase_LIBRARIES})`
`922`	`922`	`set_property(`
`923`	`923`	`TARGET`
`924`	`924`	`FileFreeTestLib`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add_library(ITKIONIFTI-TestSupport itkNiftiImageIOTestHelper.cxx)`
`29`	`29`	`itk_module_target_label(ITKIONIFTI-TestSupport)`
`30`	`30`	`target_link_libraries(`
`31`	`31`	`ITKIONIFTI-TestSupport`
`32`		`- LINK_PUBLIC`
	`32`	`+ PUBLIC`
`33`	`33`	`${ITKIONIFTI-Test_LIBRARIES}`
`34`	`34`	`)`
`35`	`35`