Merge pull request #510 from SimonRit/ITK53RC4Post3

ITK v5.3rc04

.github/workflows/build-test-package.yml

@@ -3,8 +3,8 @@ name: Build, test, package
 on: [push,pull_request]
 
 env:
-  itk-git-tag: "v5.3rc04"
-  itk-wheel-tag: "v5.3rc04.post2"
+  itk-git-tag: "171fb2ba33a87041f99328a2f26612ff33aa9cc8"
+  itk-wheel-tag: "v5.3rc04.post3"
 
 jobs:
   build-test-cxx:
@@ -193,7 +193,7 @@ jobs:
     - name: 'Build 🐍 Python 📦 package'
       run: |
         export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
-        for tarball in "" "-manylinux2014"; do
+        for tarball in "-manylinux_2_28" "-manylinux2014"; do
            rm -rf ITKPythonPackage
            export TARBALL_SPECIALIZATION=${tarball}
            ./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
@@ -224,7 +224,7 @@ jobs:
       run: |
         export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
         export LD_LIBRARY_PATH="/home/srit/Downloads/cuda116:/home/srit/Downloads/cuda116/targets/x86_64-linux/lib:/home/srit/Downloads/cuda116/lib64/stubs"
-        for tarball in "" "-manylinux2014"; do
+        for tarball in "-manylinux_2_28" "-manylinux2014"; do
            rm -rf ITKPythonPackage
            export TARBALL_SPECIALIZATION=${tarball}
            ./dockcross-manylinux-download-cache-and-build-module-wheels.sh -c "-DCUDAToolkit_ROOT=/usr/lib64/cuda116 -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda116/bin/nvcc" -x "libcuda.so;libcuda.so.1;libcudart.so;libcudart.so.11.0;libcublas.so;libcublas.so.11;libcublasLt.so;libcublasLt.so.11;libcufft.so;libcufft.so.10" cp${{ matrix.python-version }}

CMakeLists.txt

@@ -39,20 +39,23 @@ set(RTK_LIBRARIES RTK)
 #=========================================================
 # Installation variables
 #=========================================================
+if(NOT CMAKE_INSTALL_LIBDIR)
+  set(CMAKE_INSTALL_LIBDIR lib)
+endif()
 if(NOT RTK_INSTALL_RUNTIME_DIR)
   set(RTK_INSTALL_RUNTIME_DIR bin)
 endif()
 if(NOT RTK_INSTALL_LIB_DIR)
-  set(RTK_INSTALL_LIB_DIR lib)
+  set(RTK_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
 endif()
 if(NOT RTK_INSTALL_ARCHIVE_DIR)
-  set(RTK_INSTALL_ARCHIVE_DIR lib)
+  set(RTK_INSTALL_ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
 endif()
 if(NOT RTK_INSTALL_INCLUDE_DIR)
   set(RTK_INSTALL_INCLUDE_DIR include/RTK)
 endif()
 if(NOT RTK_INSTALL_PACKAGE_DIR)
-  set(RTK_INSTALL_PACKAGE_DIR "lib/cmake/RTK")
+  set(RTK_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/RTK")
 endif()
 
 #Set position independent code for Unix (-fPIC)
@@ -131,10 +134,10 @@ if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RTK_BINARY_DIR}/bin)
 endif()
 if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${RTK_BINARY_DIR}/lib)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${RTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 endif()
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${RTK_BINARY_DIR}/lib)
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${RTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 endif()
 
 #=========================================================

wrapping/itkPyBufferRTK.wrap

@@ -1,5 +1,6 @@
 # Find PyBuffer swig files from ITKBridgeNumPy sources
-set(ITKBridgeNumpy_WRAP_DIR "${ITKBridgeNumPy_INCLUDE_DIRS}/../wrapping")
+list(GET ITKBridgeNumPy_INCLUDE_DIRS 0 ITKBridgeNumPy_INCLUDE_DIR)
+set(ITKBridgeNumpy_WRAP_DIR "${ITKBridgeNumPy_INCLUDE_DIR}/../wrapping")
 
 file(READ "${ITKBridgeNumpy_WRAP_DIR}/PyBuffer.i.init"
     PyBufferInit)