Skip to content

Commit f38e8b0

Browse files
authored
Merge pull request #275 from SimonRit/cmake-options
BUG: Fix CMake options scikit-build-core on macOS and Linux
2 parents 6c6952b + 12af8e3 commit f38e8b0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

scripts/internal/manylinux-build-module-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
146146
--config-setting=cmake.define.BUILD_TESTING:BOOL=OFF \
147147
--config-setting=cmake.define.Python3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
148148
--config-setting=cmake.define.Python3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
149-
${CMAKE_OPTIONS} \
149+
${CMAKE_OPTIONS//'-D'/'--config-setting=cmake.define.'} \
150150
|| exit 1
151151
fi
152152
done

scripts/macpython-build-module-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ for VENV in "${VENVS[@]}"; do
149149
--config-setting=cmake.define.BUILD_TESTING:BOOL=OFF \
150150
--config-setting=cmake.define.Python3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
151151
--config-setting=cmake.define.Python3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
152-
${CMAKE_OPTIONS} \
152+
${CMAKE_OPTIONS//'-D'/'--config-setting=cmake.define.'} \
153153
|| exit 1
154154
fi
155155
done

scripts/windows-download-cache-and-build-module-wheels.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ if ("$setup_options".length -gt 0) {
104104
$build_command = "$build_command $setup_options"
105105
}
106106
if("$cmake_options".length -gt 0) {
107-
$build_command = "$build_command -- `"$cmake_options`""
107+
$build_command = "$build_command -- $cmake_options"
108108
}
109109
echo $build_command
110110

0 commit comments

Comments
 (0)