Update macOS build script to use Ninja Multi-Config generator (#10377)

* Update macOS build script to use Ninja Multi-Config generator

* fix
This commit is contained in:
SoftFever
2025-08-11 22:35:17 +08:00
committed by GitHub
parent 05181779d1
commit 05adf5f9c9
2 changed files with 6 additions and 19 deletions

View File

@@ -24,9 +24,9 @@ while getopts ":dpa:snt:xbc:h" opt; do
export OSX_DEPLOYMENT_TARGET="$OPTARG"
;;
x )
export SLICER_CMAKE_GENERATOR="Ninja"
export SLICER_CMAKE_GENERATOR="Ninja Multi-Config"
export SLICER_BUILD_TARGET="all"
export DEPS_CMAKE_GENERATOR="Ninja"
export DEPS_CMAKE_GENERATOR="Ninja Multi-Config"
;;
b )
export BUILD_ONLY="1"
@@ -43,7 +43,7 @@ while getopts ":dpa:snt:xbc:h" opt; do
echo " -s: Build slicer only"
echo " -n: Nightly build"
echo " -t: Specify minimum version of the target platform, default is 11.3"
echo " -x: Use Ninja CMake generator, default is Xcode"
echo " -x: Use Ninja Multi-Config CMake generator, default is Xcode"
echo " -b: Build without reconfiguring CMake"
echo " -c: Set CMake build configuration, default is Release"
echo " -1: Use single job for building"
@@ -112,12 +112,8 @@ DEPS_DIR="$PROJECT_DIR/deps"
DEPS_BUILD_DIR="$DEPS_DIR/build/$ARCH"
DEPS="$DEPS_BUILD_DIR/OrcaSlicer_deps"
# Fix for Multi-config generators
if [ "$SLICER_CMAKE_GENERATOR" == "Xcode" ]; then
export BUILD_DIR_CONFIG_SUBDIR="/$BUILD_CONFIG"
else
export BUILD_DIR_CONFIG_SUBDIR=""
fi
# For Multi-config generators like Ninja and Xcode
export BUILD_DIR_CONFIG_SUBDIR="/$BUILD_CONFIG"
function build_deps() {
# iterate over two architectures: x86_64 and arm64