Merge branch 'main' into PyImath-include-fix

Author: cary-ilm

.github/workflows/analysis_workflow.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup container
         run: sudo rm -rf /usr/local/lib64/cmake/glew
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 50
       - name: Create build directories
@@ -102,7 +102,7 @@ jobs:
       - name: Setup container
         run: sudo rm -rf /usr/local/lib64/cmake/glew
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 50
       - name: Create build directories

.github/workflows/ci_steps.yml

@@ -67,7 +67,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set Up Directories & Environment
         run: |
@@ -227,16 +227,31 @@ jobs:
         shell: bash
 
       - name: Install CMake
-        if: runner.os == 'Linux' && inputs.cmake != ''
         # CMakeLists.txt specifies a minimum CMake version of 3.14 for
-        # the Imath project, so use that for the CI. Except that the
-        # conan toolchain requires a minimum of 3.15, so use that for
-        # the runs that require conan.
+        # the Imath project, so use that for the CI, unless a specific
+        # version is specified. The conan toolchain requires a minimum
+        # of 3.15, so use that for the runs that require conan.
         run: |
-          CMAKE_VERSION=${{ inputs.cmake }}
-          wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz
-          tar -xzf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz
-          echo "CMAKE=$PWD/cmake-$CMAKE_VERSION-Linux-x86_64/bin/cmake" >> $GITHUB_ENV
+          set -ex
+          CMAKE=cmake
+          CTEST=ctest
+          if [ "${{ inputs.cmake }}" != "" ]; then
+            if [ "$RUNNER_OS" == "Linux" ]; then
+              CMAKE_VERSION=${{ inputs.cmake }}
+              CURRENT_CMAKE_VERSION=$(cmake --version | head -n 1 | cut -f3 -d' ')
+              if [ "$CMAKE_VERSION" != "$CURRENT_CMAKE_VERSION" ]; then
+                wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz
+                tar -xzf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz 
+                CMAKE=$(find "$PWD" -type f -path "*/bin/cmake" | head -n 1)
+                CTEST=$(find "$PWD" -type f -path "*/bin/ctest" | head -n 1)
+              fi
+            else
+              echo "Explicit cmake version only supported on Linux."
+              exit 1
+            fi
+          fi
+          echo CMAKE="$CMAKE" >> $GITHUB_ENV
+          echo CTEST="$CTEST" >> $GITHUB_ENV
         shell: bash
 
       - name: Construct CMake command
@@ -426,7 +441,7 @@ jobs:
           set -x
           export PATH="$IMATH_PATH:$PATH"
           export PYTHONPATH=$PYTHON_INSTALL_DIR
-          ctest -T Test -C ${{ inputs.build-type }} --test-dir $BUILD_DIR --timeout 7200 --output-on-failure -VV
+          $CTEST -T Test -C ${{ inputs.build-type }} --test-dir $BUILD_DIR --timeout 7200 --output-on-failure -VV
         shell: bash
 
       - name: Test (msys2)
@@ -436,7 +451,7 @@ jobs:
           set -x
           export PATH="$IMATH_PATH:$PATH"
           export PYTHONPATH=$PYTHON_INSTALL_DIR
-          ctest -T Test -C ${{ inputs.build-type }} --test-dir $BUILD_DIR --timeout 7200 --output-on-failure -VV
+          $CTEST -T Test -C ${{ inputs.build-type }} --test-dir $BUILD_DIR --timeout 7200 --output-on-failure -VV
         shell: msys2 {0}
 
       - name: Prepare install_manifest

.github/workflows/ci_workflow.yml

@@ -95,6 +95,10 @@ jobs:
             cxx-compiler: clang++
             cc-compiler: clang
 
+          - build: 7
+            label: cmake 4
+            cmake: 4.0.3
+
   macOS:
     name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml

.github/workflows/ci_workflow_vfx.yml

@@ -58,7 +58,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Configure
         run: |

.github/workflows/codeql.yml

@@ -65,7 +65,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/release-sign.yml

@@ -48,7 +48,7 @@ jobs:
         shell: bash
 
       - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Create archive
         run: git archive --format=tar.gz -o ${IMATH_TARBALL} --prefix ${IMATH_PREFIX} ${TAG}

.github/workflows/scorecard.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/website_workflow.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Create build directory
         run: mkdir _build
       - name: Install doxygen 

src/pybind11/PyBindImath/CMakeLists.txt

@@ -129,11 +129,11 @@ if (IMATH_INSTALL)
     #
 
     set(PYTHON_INSTALL_DIR "lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages")
-    message(STATUS "installing ${PYBINDIMATH_MODULE} to ${PYTHON_INSTALL_DIR}")
+    message(STATUS "installing ${PYBINDIMATH_MODULE_NAME} to ${PYTHON_INSTALL_DIR}")
 
   else()
 
-    message(STATUS "installing ${PYBINDIMATH_MODULE} to ${PYTHON_INSTALL_DIR} (set externally)")
+    message(STATUS "installing ${PYBINDIMATH_MODULE_NAME} to ${PYTHON_INSTALL_DIR} (set externally)")
 
   endif()
 

src/python/CMakeLists.txt

@@ -13,7 +13,7 @@ if(NOT Python3_FOUND)
     message(FATAL_ERROR "Could not find Python")
 endif()
 
-find_package(Boost REQUIRED COMPONENTS python)
+find_package(Boost CONFIG REQUIRED COMPONENTS python)
 
 if(NOT Boost_FOUND)
     message(FATAL_ERROR "Could not find Boost")