Merge pull request #275 from SimonRit/cmake-options

BUG: Fix CMake options scikit-build-core on macOS and Linux
InsightSoftwareConsortium · May 30, 2024 · f38e8b0 · f38e8b0
2 parents 6c6952b + 12af8e3
commit f38e8b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scripts/internal/manylinux-build-module-wheels.sh b/scripts/internal/manylinux-build-module-wheels.sh
@@ -146,7 +146,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
         --config-setting=cmake.define.BUILD_TESTING:BOOL=OFF \
         --config-setting=cmake.define.Python3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
         --config-setting=cmake.define.Python3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
-        ${CMAKE_OPTIONS} \
+        ${CMAKE_OPTIONS//'-D'/'--config-setting=cmake.define.'} \
       || exit 1
     fi
 done

diff --git a/scripts/macpython-build-module-wheels.sh b/scripts/macpython-build-module-wheels.sh
@@ -149,7 +149,7 @@ for VENV in "${VENVS[@]}"; do
         --config-setting=cmake.define.BUILD_TESTING:BOOL=OFF \
         --config-setting=cmake.define.Python3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
         --config-setting=cmake.define.Python3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
-        ${CMAKE_OPTIONS} \
+        ${CMAKE_OPTIONS//'-D'/'--config-setting=cmake.define.'} \
       || exit 1
     fi
 done

diff --git a/scripts/windows-download-cache-and-build-module-wheels.ps1 b/scripts/windows-download-cache-and-build-module-wheels.ps1
@@ -104,7 +104,7 @@ if ("$setup_options".length -gt 0) {
   $build_command = "$build_command $setup_options"
 }
 if("$cmake_options".length -gt 0) {
-  $build_command = "$build_command -- `"$cmake_options`""
+  $build_command = "$build_command -- $cmake_options"
 }
 echo $build_command