Merge pull request InsightSoftwareConsortium#5796 from blowekamp/gersemi_thirdparty

STYLE: Apply gersemi style to a deeper layer in Thirdparty libraries

Author: blowekamp

.pre-commit-config.yaml

@@ -62,7 +62,7 @@ repos:
   - id: gersemi
     args: [ '--config', '.gersemi.config', '-i' ]
     files: '.(cmake|wrap)$|CMakeLists.txt'
-    exclude: "\\/ThirdParty\\/[^\\/]+\\/[^\\/]+\\/|Modules\\/Remote\\/|\\/ExternalData.cmake|\\/.pixi\\/|\\/cmake-build.*\\/"
+    exclude: "\\/ThirdParty\\/[^\\/]+\\/[^\\/]+\\/[^\\/]+\\/|Modules\\/Remote\\/|\\/ExternalData.cmake|\\/.pixi\\/|\\/cmake-build.*\\/"
 - repo: https://github.com/pre-commit/mirrors-clang-format
   rev: v19.1.7
   hooks:

Modules/ThirdParty/DCMTK/CMake/FindLIBICONV.cmake

@@ -6,34 +6,39 @@
 #  LIBICONV_LIBRARIES    - Lists of libraries when using iconv
 #  LIBICONV_FOUND        - True if iconv found
 
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 
 # Look for the header file
 if(NOT LIBICONV_INCLUDE_DIR)
-  FIND_PATH(LIBICONV_INCLUDE_DIR NAMES iconv.h)
+  find_path(LIBICONV_INCLUDE_DIR NAMES iconv.h)
 endif()
-MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR)
+mark_as_advanced(LIBICONV_INCLUDE_DIR)
 
 # Look for the library
-SET(LIBICONV_LIBS iconv)
+set(LIBICONV_LIBS iconv)
 
 if(NOT LIBICONV_LIBRARY)
-  FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
+  find_library(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
 endif()
-MARK_AS_ADVANCED(LIBICONV_LIBRARY)
+mark_as_advanced(LIBICONV_LIBRARY)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR)
+find_package_handle_standard_args(
+  LIBICONV
+  REQUIRED_VARS
+    LIBICONV_LIBRARY
+    LIBICONV_INCLUDE_DIR
+)
 
 # Copy the result to output variables
-IF(LIBICONV_FOUND)
-  SET(LIBICONV_LIBRARIES ${LIBICONV_LIBRARY})
-  SET(LIBICONV_INCLUDE_DIRS ${LIBICONV_INCLUDE_DIR})
+if(LIBICONV_FOUND)
+  set(LIBICONV_LIBRARIES ${LIBICONV_LIBRARY})
+  set(LIBICONV_INCLUDE_DIRS ${LIBICONV_INCLUDE_DIR})
   include_directories(${LIBICONV_INCLUDE_DIR})
   link_directories(${LIBICONV_LIBDIR})
-ELSE(LIBICONV_FOUND)
-  SET(LIBICONV_LIBS)
-  SET(LIBICONV_LIBRARY)
-  SET(LIBICONV_LIBRARIES)
-  SET(LIBICONV_INCLUDE_DIR)
-  SET(LIBICONV_INCLUDE_DIRS)
-ENDIF(LIBICONV_FOUND)
+else(LIBICONV_FOUND)
+  set(LIBICONV_LIBS)
+  set(LIBICONV_LIBRARY)
+  set(LIBICONV_LIBRARIES)
+  set(LIBICONV_INCLUDE_DIR)
+  set(LIBICONV_INCLUDE_DIRS)
+endif(LIBICONV_FOUND)

Modules/ThirdParty/DCMTK/CMake/dcmtkPatchScript.cmake

@@ -3,43 +3,63 @@ set(dcmtk3rdParty ${dcmtkSource}/CMake/3rdparty.cmake)
 #
 # Newer versions of TIFF depend on JPEG
 file(READ ${dcmtk3rdParty} code)
-string(REPLACE "set(LIBTIFF_LIBS \${TIFF_LIBRARY})
+string(
+  REPLACE
+  "set(LIBTIFF_LIBS \${TIFF_LIBRARY})
 "
-"set(LIBTIFF_LIBS \${TIFF_LIBRARY})
+  "set(LIBTIFF_LIBS \${TIFF_LIBRARY})
     list(APPEND LIBTIFF_LIBS \${JPEG_LIBRARY})
-" code "${code}")
+"
+  code
+  "${code}"
+)
 #
 # we pass in the TIFF and ZLIB library stuff,
 # running find_package for those libraries
 # screws up using the ITK versions
 if(NOT ITK_USE_SYSTEM_TIFF)
-  string(REPLACE "find_package(TIFF QUIET)
-" "" code "${code}")
+  string(
+    REPLACE
+    "find_package(TIFF QUIET)
+"
+    ""
+    code
+    "${code}"
+  )
 endif()
 
 if(NOT ITK_USE_SYSTEM_ZLIB)
-string(REPLACE "find_package(ZLIB QUIET)
-" "" code "${code}")
+  string(
+    REPLACE
+    "find_package(ZLIB QUIET)
+"
+    ""
+    code
+    "${code}"
+  )
 endif()
 
 file(WRITE ${dcmtk3rdParty} "${code}")
 
 #
 # in order to use the ITK versions of ZLIB and TIFF
 # it is necessary to use the ITK symbol-mangled versions
-file(GLOB_RECURSE dcmtk_src RELATIVE ${dcmtkSource} "*.cc" "*.h")
+file(
+  GLOB_RECURSE dcmtk_src
+  RELATIVE ${dcmtkSource}
+  "*.cc"
+  "*.h"
+)
 
-foreach (filename ${dcmtk_src})
+foreach(filename ${dcmtk_src})
   set(_filename ${dcmtkSource}/${filename})
   #  message("patching ${_filename}")
   file(READ ${_filename} sourcecode)
   if(NOT ITK_USE_SYSTEM_ZLIB)
-    string(REPLACE "<zlib.h>"
-      "\"itk_zlib.h\"" sourcecode "${sourcecode}")
+    string(REPLACE "<zlib.h>" "\"itk_zlib.h\"" sourcecode "${sourcecode}")
   endif()
   if(NOT ITK_USE_SYSTEM_TIFF)
-    string(REPLACE "<tiffio.h>"
-      "\"itk_tiff.h\"" sourcecode "${sourcecode}")
+    string(REPLACE "<tiffio.h>" "\"itk_tiff.h\"" sourcecode "${sourcecode}")
   endif()
   file(WRITE ${_filename} "${sourcecode}")
 endforeach(filename)
@@ -52,11 +72,14 @@ foreach(cmakelists ${dcmtk_cmakelists})
   set(_cmakelists ${dcmtkSource}/${cmakelists})
   message("CMakeLists ${_cmakelists}")
   file(READ ${_cmakelists} source)
-  string(REGEX REPLACE
+  string(
+    REGEX
+    REPLACE
     "add_subdirectory\\((.*) apps "
     "add_subdirectory(\\1 "
     source
-    "${source}")
+    "${source}"
+  )
   file(WRITE ${_cmakelists} "${source}")
 endforeach(cmakelists)
 
@@ -68,10 +91,15 @@ set(dcmtkCmakeLists_txt ${dcmtkSource}/CMakeLists.txt)
 
 file(READ ${dcmtkCmakeLists_txt} cmakelists)
 
-string(REPLACE "# build output files in these directories
+string(
+  REPLACE
+  "# build output files in these directories
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY \"\${CMAKE_BINARY_DIR}/lib\")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY \"\${CMAKE_BINARY_DIR}/lib\")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"\${CMAKE_BINARY_DIR}/bin\")
 "
-"" cmakelists "${cmakelists}")
+  ""
+  cmakelists
+  "${cmakelists}"
+)
 file(WRITE ${dcmtkCmakeLists_txt} "${cmakelists}")

Modules/ThirdParty/Expat/src/CMakeLists.txt

@@ -5,7 +5,8 @@ set(ITK3P_INSTALL_LIBRARY_DIR "${ITKExpat_INSTALL_LIBRARY_DIR}")
 set(ITK3P_INSTALL_ARCHIVE_DIR "${ITKExpat_INSTALL_ARCHIVE_DIR}")
 add_subdirectory(itkexpat)
 itk_module_target(ITKEXPAT NO_INSTALL)
-mark_as_advanced(FORCE
+mark_as_advanced(
+  FORCE
   EXPAT_BUILD_DOCS
   EXPAT_BUILD_EXAMPLES
   EXPAT_BUILD_FUZZERS
@@ -22,4 +23,4 @@ mark_as_advanced(FORCE
   EXPAT_WITH_SYS_GETRANDOM
   EXPAT_GE
   XML_GE
-  )
+)

Modules/ThirdParty/GDCM/src/CMakeLists.txt

@@ -1,11 +1,17 @@
 if(CMAKE_COMPILER_IS_GNUCC)
-  check_c_compiler_flag("-fno-ipa-cp-clone" _HAS_fno-ipa-cp-clone)
+  check_c_compiler_flag(
+    "-fno-ipa-cp-clone"
+    _HAS_fno-ipa-cp-clone
+  )
   if(_HAS_fno-ipa-cp-clone)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-ipa-cp-clone")
   endif()
 endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
-  check_cxx_compiler_flag("-fno-ipa-cp-clone" _HAS_fno-ipa-cp-clone)
+  check_cxx_compiler_flag(
+    "-fno-ipa-cp-clone"
+    _HAS_fno-ipa-cp-clone
+  )
   if(_HAS_fno-ipa-cp-clone)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-ipa-cp-clone")
   endif()
@@ -15,7 +21,6 @@ if(CMAKE_LINKER MATCHES "link.exe$")
   set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221")
 endif()
 
-
 set(GDCM_TARGETS_NAME ${ITKGDCM-targets})
 set(GDCM_INSTALL_BIN_DIR ${ITKGDCM_INSTALL_RUNTIME_DIR})
 set(GDCM_INSTALL_LIB_DIR ${ITKGDCM_INSTALL_LIBRARY_DIR})
@@ -43,9 +48,24 @@ set(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES})
 set(GDCM_LEGACY_REMOVE OFF CACHE INTERNAL "Remove all legacy code completely.")
 set(GDCM_LEGACY_SILENT OFF CACHE INTERNAL "Silence all legacy code messages.")
 set(GDCM_SUPPORT_BROKEN_IMPLEMENTATION ON CACHE INTERNAL "Handle broken DICOM")
-set(GDCM_TEMP_DIRECTORY "${ITK_TEST_OUTPUT_DIR}" CACHE INTERNAL "Path to a valid temp directory")
-set(GDCM_USE_KAKADU OFF CACHE INTERNAL "Use kakadu lib, only turn it on if you know what you are doing.")
-set(GDCM_USE_PVRG OFF CACHE INTERNAL "Use pvrg lib, only turn it on if you know what you are doing.")
+set(
+  GDCM_TEMP_DIRECTORY
+  "${ITK_TEST_OUTPUT_DIR}"
+  CACHE INTERNAL
+  "Path to a valid temp directory"
+)
+set(
+  GDCM_USE_KAKADU
+  OFF
+  CACHE INTERNAL
+  "Use kakadu lib, only turn it on if you know what you are doing."
+)
+set(
+  GDCM_USE_PVRG
+  OFF
+  CACHE INTERNAL
+  "Use pvrg lib, only turn it on if you know what you are doing."
+)
 set(GDCM_USE_SYSTEM_LJPEG OFF CACHE INTERNAL "Use system ljpeg (ijg lib)")
 set(GDCM_USE_SYSTEM_OPENSSL OFF CACHE INTERNAL "Use system OpenSSL")
 set(GDCM_USE_SYSTEM_PODOFO OFF CACHE INTERNAL "Use system podofo (pdf)")
@@ -69,21 +89,22 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 add_subdirectory(gdcm)
 
-foreach(lib
-    gdcmCommon
-    gdcmDICT
-    gdcmDSED
-    gdcmIOD
-    gdcmMEXD
-    gdcmMSFF
-    gdcmcharls
-    gdcmjpeg12
-    gdcmjpeg16
-    gdcmjpeg8
-    gdcmopenjp2
-    gdcmsocketxx
-    gdcmuuid
-    )
+foreach(
+  lib
+  gdcmCommon
+  gdcmDICT
+  gdcmDSED
+  gdcmIOD
+  gdcmMEXD
+  gdcmMSFF
+  gdcmcharls
+  gdcmjpeg12
+  gdcmjpeg16
+  gdcmjpeg8
+  gdcmopenjp2
+  gdcmsocketxx
+  gdcmuuid
+)
   if(TARGET ${lib}) # some gdcm targets are conditional
     itk_module_target(${lib} NO_INSTALL)
   endif()

Modules/ThirdParty/GoogleTest/src/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 # Prevent overriding the parent project's compiler/linker
 # settings on Windows
 set(gtest_force_shared_crt ON CACHE INTERNAL "")
@@ -7,11 +6,10 @@ set(gtest_force_shared_crt ON CACHE INTERNAL "")
 # - google test uses CMake modern "Threads::Threads" alias which is
 #   not properly exported easily while ITK uses the old library
 #   variable style
-set(gtest_disable_pthreads  ON CACHE INTERNAL "")
-
+set(gtest_disable_pthreads ON CACHE INTERNAL "")
 
-set(BUILD_GTEST                 ON  CACHE INTERNAL "")
-set(BUILD_GMOCK                 OFF CACHE INTERNAL "")
+set(BUILD_GTEST ON CACHE INTERNAL "")
+set(BUILD_GMOCK OFF CACHE INTERNAL "")
 
 # Must build GTest as static since EXCLUDE_FROM_ALL, would exclude
 # needed GTest shared libraries from being installed.
@@ -20,17 +18,32 @@ set(BUILD_SHARED_LIBS OFF)
 set(GTEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/itkgoogletest/")
 
 # check if we are using "system" source code
-if (ITK_USE_SYSTEM_GOOGLETEST)
+if(ITK_USE_SYSTEM_GOOGLETEST)
   set(GTEST_SRC "${GTEST_ROOT}")
 endif()
 
 # Add googletest directly to our build but exclude from using it's
 # target's and installation unless referenced by other dependencies.
-add_subdirectory( "${GTEST_SRC}"
-  "${CMAKE_CURRENT_BINARY_DIR}/GTest-build" EXCLUDE_FROM_ALL)
-
-set_property(TARGET gtest PROPERTY EXPORT_NAME GTest::gtest)
-set_property(TARGET gtest_main PROPERTY EXPORT_NAME GTest::gtest_main)
+add_subdirectory(
+  "${GTEST_SRC}"
+  "${CMAKE_CURRENT_BINARY_DIR}/GTest-build"
+  EXCLUDE_FROM_ALL
+)
+
+set_property(
+  TARGET
+    gtest
+  PROPERTY
+    EXPORT_NAME
+      GTest::gtest
+)
+set_property(
+  TARGET
+    gtest_main
+  PROPERTY
+    EXPORT_NAME
+      GTest::gtest_main
+)
 
 itk_module_target(gtest NO_INSTALL)
 itk_module_target(gtest_main NO_INSTALL)