From 05adf5f9c9f0e839a63bd02cbfd74031187bc895 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 11 Aug 2025 22:35:17 +0800 Subject: [PATCH] Update macOS build script to use Ninja Multi-Config generator (#10377) * Update macOS build script to use Ninja Multi-Config generator * fix --- .github/workflows/claude-code-review.yml | 11 +---------- build_release_macos.sh | 14 +++++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml index 9177b2f137..f7dda2a0c5 100644 --- a/.github/workflows/claude-code-review.yml +++ b/.github/workflows/claude-code-review.yml @@ -1,19 +1,10 @@ name: Claude Code Review on: - pull_request: - types: [opened, synchronize] - # Optional: Only run on specific file changes - # paths: - # - "src/**/*.ts" - # - "src/**/*.tsx" - # - "src/**/*.js" - # - "src/**/*.jsx" + workflow_dispatch: jobs: claude-review: - # Only run for PRs from the same repository (skip forks) - if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} # Optional: Filter by PR author # if: | # github.event.pull_request.user.login == 'external-contributor' || diff --git a/build_release_macos.sh b/build_release_macos.sh index 3f22dd99ee..d31a8ec6e6 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -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