juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-12 03:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forward ORCA_EXTRA_BUILD_ARGS from the macOS and Windows build scripts

Browse Source 
build_linux.sh already passes this variable to the slicer configure, so
CI can add a CMake option without editing three scripts. The macOS
script reads it into an array the way build_linux.sh does.
This commit is contained in:
Hanif Koh
2026-09-10 18:23:30 +08:00
parent be1c128a19
commit 7de6c7499f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_release_macos.sh
View File

@@ -255,6 +255,7 @@ function build_slicer() {
mkdir -p "$PROJECT_BUILD_DIR" mkdir -p "$PROJECT_BUILD_DIR"
cd "$PROJECT_BUILD_DIR" cd "$PROJECT_BUILD_DIR"
if [ "1." != "$BUILD_ONLY". ]; then if [ "1." != "$BUILD_ONLY". ]; then
read -r -a EXTRA_BUILD_ARGS <<< "${ORCA_EXTRA_BUILD_ARGS:-}"
cmake "${PROJECT_DIR}" \ cmake "${PROJECT_DIR}" \
-G "${SLICER_CMAKE_GENERATOR}" \ -G "${SLICER_CMAKE_GENERATOR}" \
-DORCA_TOOLS=ON \ -DORCA_TOOLS=ON \
@@ -264,7 +265,8 @@ function build_slicer() {
-DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \ -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \ -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
-DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \ -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
${CMAKE_POLICY_COMPAT} ${CMAKE_POLICY_COMPAT} \
"${EXTRA_BUILD_ARGS[@]}"
fi fi
cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET" cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
) )

4
build_release_vs.bat
View File

@@ -164,10 +164,10 @@ cd %build_dir%
echo on echo on
set CMAKE_POLICY_VERSION_MINIMUM=3.5 set CMAKE_POLICY_VERSION_MINIMUM=3.5
if "%USE_NINJA%"=="1" ( if "%USE_NINJA%"=="1" (
cmake .. -G %CMAKE_GENERATOR% %CLANG_ARG% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% cmake .. -G %CMAKE_GENERATOR% %CLANG_ARG% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% %ORCA_EXTRA_BUILD_ARGS%
cmake --build . --config %build_type% --target all cmake --build . --config %build_type% --target all
) else ( ) else (
cmake .. -G %CMAKE_GENERATOR% -A %arch% %TOOLSET_ARG% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% cmake .. -G %CMAKE_GENERATOR% -A %arch% %TOOLSET_ARG% -DORCA_TOOLS=ON %SIG_FLAG% -DBUILD_TESTS=%BUILD_TESTS% -DCMAKE_BUILD_TYPE=%build_type% %ORCA_EXTRA_BUILD_ARGS%
cmake --build . --config %build_type% --target ALL_BUILD -- -m cmake --build . --config %build_type% --target ALL_BUILD -- -m
) )
@echo off @echo off