superbuild: pin CMAKE_INSTALL_LIBDIR, fix lib64 assumptions

The Linux build failed in the manylinux container: GNUInstallDirs resolves
CMAKE_INSTALL_LIBDIR to "lib64" on 64-bit RHEL-family systems, which is what the
manylinux images are, so zlib installed to deps/zlib/lib64 while the ZLIB_LIBRARY
path computed at configure time pointed at deps/zlib/lib. macOS and Debian both
use "lib", so this could not reproduce anywhere the earlier workflows ran.

Pin CMAKE_INSTALL_LIBDIR=lib for every sub-project so the dependency install trees
have the same shape on all platforms, and stop hardcoding a single directory in
the two scripts that look for installed libraries -- both now search lib and lib64
so a project that ignores the setting still resolves.

The ITK bundled-zlib check needed this most: it globs for a file that should not
exist, so pointing it at the wrong directory made it pass silently, which is the
worst thing a guard can do.

Also drop cancel-in-progress here. A cold build is 30-60 minutes per platform, so
cancelling on every push discards the results of platforms that were about to
report something useful.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: fedorov

.github/workflows/build-binaries.yml

@@ -35,7 +35,11 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  # Deliberately not cancel-in-progress, unlike the wheel workflows. A cold build here is
+  # 30-60 minutes per platform, so cancelling on every push discards a lot of work and, worse,
+  # discards the results of platforms that were about to tell you something. A new run queues
+  # behind the current one instead.
+  cancel-in-progress: false
 
 env:
   # AlmaLinux 8 / glibc 2.28. Chosen over dockcross/manylinux2014 (glibc 2.17, what dcmqi

superbuild/CMakeLists.txt

@@ -110,6 +110,12 @@ set(SB_COMMON_ARGS
   -DBUILD_SHARED_LIBS:BOOL=OFF
   -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
   -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+  # Pin the library install directory. GNUInstallDirs resolves CMAKE_INSTALL_LIBDIR to
+  # "lib64" on 64-bit RHEL-family systems -- which is what the manylinux images are -- and to
+  # "lib" on macOS and Debian. Leaving it to the default means the dependency install trees
+  # have a different shape on Linux than everywhere else, and any path this superbuild
+  # computes for a specific library is then wrong on exactly one platform.
+  -DCMAKE_INSTALL_LIBDIR:STRING=lib
   )
 
 if(APPLE)

superbuild/External_ITK.cmake

@@ -27,7 +27,7 @@ ExternalProject_Add(ITK
 # Catch it here, next to the cause, rather than in a link error much later.
 ExternalProject_Add_Step(ITK check-no-bundled-zlib
   COMMAND ${CMAKE_COMMAND}
-    -DITK_LIB_DIR=${ITK_PREFIX}/lib
+    -DITK_PREFIX=${ITK_PREFIX}
     -P ${CMAKE_CURRENT_LIST_DIR}/check_itk_zlib.cmake
   DEPENDEES install
   COMMENT "Checking that ITK did not build its own zlib"

superbuild/External_zlib.cmake

@@ -38,8 +38,8 @@ ExternalProject_Add(zlib
 
 ExternalProject_Add_Step(zlib canonicalize
   COMMAND ${CMAKE_COMMAND}
-    -DZLIB_LIB_DIR=${ZLIB_PREFIX}/lib
-    -DOUTPUT_NAME=${ZLIB_CANONICAL_NAME}
+    -DZLIB_PREFIX=${ZLIB_PREFIX}
+    -DTARGET_PATH=${ZLIB_LIBRARY}
     -P ${CMAKE_CURRENT_LIST_DIR}/canonicalize_zlib.cmake
   DEPENDEES install
   COMMENT "Copying the zlib static library to a canonical name"

superbuild/canonicalize_zlib.cmake

@@ -1,36 +1,46 @@
-# Copies the zlib-ng static library to a fixed filename.
+# Copies the zlib-ng static library to a fixed path.
 #
 # zlib-ng names its output differently across platforms and configurations (libz.a, libz-ng.a,
 # zlib.lib, zlibstatic.lib, ...), but ITK and DCMTK need an explicit ZLIB_LIBRARY path that
 # the superbuild can compute at configure time, before zlib has been built. Resolving the
 # real name here and copying it to a canonical one lets the dependents be configured with a
 # path that is known up front.
 #
-# Invoked as: cmake -DZLIB_LIB_DIR=... -DOUTPUT_NAME=... -P canonicalize_zlib.cmake
+# Both lib/ and lib64/ are searched. The superbuild passes CMAKE_INSTALL_LIBDIR=lib so this
+# should not be necessary, but a project that ignores it would otherwise fail here with a
+# confusing "not found" -- and on RHEL-family systems, which is what the manylinux images
+# are, lib64 is the default that gets ignored *to*.
+#
+# Invoked as: cmake -DZLIB_PREFIX=... -DTARGET_PATH=... -P canonicalize_zlib.cmake
 
-if(NOT ZLIB_LIB_DIR OR NOT OUTPUT_NAME)
-  message(FATAL_ERROR "ZLIB_LIB_DIR and OUTPUT_NAME must both be set")
+if(NOT ZLIB_PREFIX OR NOT TARGET_PATH)
+  message(FATAL_ERROR "ZLIB_PREFIX and TARGET_PATH must both be set")
 endif()
 
-set(_target "${ZLIB_LIB_DIR}/${OUTPUT_NAME}")
-
-file(GLOB _candidates "${ZLIB_LIB_DIR}/*.a" "${ZLIB_LIB_DIR}/*.lib")
-list(REMOVE_ITEM _candidates "${_target}")
+file(GLOB _candidates
+  "${ZLIB_PREFIX}/lib/*.a"
+  "${ZLIB_PREFIX}/lib/*.lib"
+  "${ZLIB_PREFIX}/lib64/*.a"
+  "${ZLIB_PREFIX}/lib64/*.lib"
+  )
+list(REMOVE_ITEM _candidates "${TARGET_PATH}")
 
 list(LENGTH _candidates _count)
 if(_count EQUAL 0)
   message(FATAL_ERROR
-    "No static zlib library found in ${ZLIB_LIB_DIR}. zlib-ng did not install what was "
-    "expected -- check that BUILD_SHARED_LIBS was OFF.")
+    "No static zlib library found under ${ZLIB_PREFIX} (searched lib/ and lib64/). "
+    "zlib-ng did not install what was expected -- check that BUILD_SHARED_LIBS was OFF.")
 endif()
 if(_count GREATER 1)
   # More than one archive means the naming assumption has drifted, and silently picking the
   # first would be how a subtly wrong zlib gets linked into every downstream project.
   message(FATAL_ERROR
-    "Expected exactly one static zlib library in ${ZLIB_LIB_DIR}, found ${_count}: "
+    "Expected exactly one static zlib library under ${ZLIB_PREFIX}, found ${_count}: "
     "${_candidates}")
 endif()
 
 list(GET _candidates 0 _source)
-file(COPY_FILE "${_source}" "${_target}" ONLY_IF_DIFFERENT)
-message(STATUS "zlib: ${_source} -> ${_target}")
+get_filename_component(_target_dir "${TARGET_PATH}" DIRECTORY)
+file(MAKE_DIRECTORY "${_target_dir}")
+file(COPY_FILE "${_source}" "${TARGET_PATH}" ONLY_IF_DIFFERENT)
+message(STATUS "zlib: ${_source} -> ${TARGET_PATH}")

superbuild/check_itk_zlib.cmake

@@ -5,7 +5,15 @@
 # stay unprefixed and collide at link time. The resulting error names a plastimatch object
 # file and gives no hint that ITK is the cause, so check here instead.
 
-file(GLOB _bundled "${ITK_LIB_DIR}/libitkzlib*" "${ITK_LIB_DIR}/itkzlib*")
+if(NOT ITK_PREFIX)
+  message(FATAL_ERROR "ITK_PREFIX must be set")
+endif()
+
+# lib/ and lib64/ are both searched: this check silently passes -- the worst outcome for a
+# guard -- if it looks in a directory the libraries were never installed to.
+file(GLOB _bundled
+  "${ITK_PREFIX}/lib/libitkzlib*" "${ITK_PREFIX}/lib/itkzlib*"
+  "${ITK_PREFIX}/lib64/libitkzlib*" "${ITK_PREFIX}/lib64/itkzlib*")
 if(_bundled)
   message(FATAL_ERROR
     "ITK built its own zlib despite ITK_USE_SYSTEM_ZLIB=ON: ${_bundled}\n"