another try at fixing a build break

Author: carsonRadtke

.github/workflows/cmake/action.yml

@@ -3,7 +3,11 @@ inputs:
   cmake_preset:
     required: true
     type: string
-  extra_cmake_args:
+  extra_cmake_configure_args:
+    required: false
+    type: string
+    default: ''
+  extra_cmake_configure_args:
     required: false
     type: string
     default: ''
@@ -16,14 +20,14 @@ runs:
   using: composite
   steps:
     - name: Configure CMake
-      run: cmake --preset ${{ inputs.cmake_preset }} -DCI_TESTING:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Werror=dev ${{ inputs.extra_cmake_args }}
+      run: cmake --preset ${{ inputs.cmake_preset }} ${{ inputs.extra_cmake_configure_args }} -DCI_TESTING:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Werror=dev 
       shell: ${{ env.RUNNER_OS == 'Windows' && 'pwsh' || 'bash' }}
 
     - name: Build (with preset)
-      run: cmake --build --preset ${{ inputs.cmake_preset }}
+      run: cmake --build --preset ${{ inputs.cmake_preset }} ${{ inputs.extra_cmake_build_args }}
       shell: ${{ env.RUNNER_OS == 'Windows' && 'pwsh' || 'bash' }}
 
     - name: Test (with preset)
-      run: ctest ${{ inputs.extra_ctest_args }} --preset ${{ inputs.cmake_preset }} --output-on-failure --no-compress-output
+      run: ctest --preset ${{ inputs.cmake_preset }} ${{ inputs.extra_ctest_args }} --output-on-failure --no-compress-output
       shell: ${{ env.RUNNER_OS == 'Windows' && 'pwsh' || 'bash' }}
 

.github/workflows/compilers.yml

@@ -75,7 +75,7 @@ jobs:
         uses: ./.github/workflows/cmake
         with:
           cmake_preset: clang-${{ matrix.cxx_version }}-${{ matrix.build_type == 'Debug' && 'debug' || 'release' }}
-          extra_cmake_args: '-DCMAKE_CXX_FLAGS="-isysroot \"$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk\""'
+          extra_cmake_configure_args: '-DCMAKE_CXX_FLAGS="-isysroot \"$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk\""'
 
   VisualStudio:
     strategy:
@@ -94,6 +94,7 @@ jobs:
         uses: ./.github/workflows/cmake
         with:
           cmake_preset: msvc-${{ matrix.cxx_version }}-${{ matrix.build_type == 'Debug' && 'debug' || 'release' }}
-          extra_cmake_args: ${{ matrix.extra_args }} --config ${{ matrix.build_type }}
+          extra_cmake_configure_args: ${{ matrix.extra_args }}
+          extra_cmake_build_args: --config ${{ matrix.build_type }}
           extra_ctest_args: -C ${{ matrix.build_type }}