Universal mac build (#9074)

build universal Mac app

.github/workflows/build_all.yml

@@ -50,8 +50,6 @@ jobs:
           - os: ubuntu-20.04
           - os: ubuntu-24.04
           - os: windows-latest
-          - os: macos-14
-            arch: x86_64
           - os: macos-14
             arch: arm64
     uses: ./.github/workflows/build_check_cache.yml

.github/workflows/build_check_cache.yml

@@ -30,13 +30,12 @@ jobs:
       - name: set outputs
         id: set_outputs
         env:
-          underscore-arch: ${{ inputs.os == 'macos-14' && '_' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
+          # todo: this is mad! refactor other build scripts to use same name
-          dash-arch: ${{ inputs.os == 'macos-14' && '-' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
+          dep-folder-name: ${{ inputs.os == 'windows-latest' && '/OrcaSlicer_dep' || inputs.os == 'macos-14' && '' || inputs.os != 'macos-14' && '/destdir' || '' }}
-          dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-14') && 'OrcaSlicer_dep' || 'destdir' }}
           output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
         run: |
-          echo cache-key=${{ inputs.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
+          echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
-          echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/${{ env.dep-folder-name }}${{ env.underscore-arch }} >> ${{ env.output-cmd }}
+          echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }}
             
       - name: load cache
         id: cache_deps

.github/workflows/build_deps.yml

@@ -74,12 +74,14 @@ jobs:
         if: inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
-            brew install automake texinfo ninja libtool
+            brew install automake texinfo libtool
             brew list
-            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
-            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
             brew uninstall --ignore-dependencies zstd
-            ./build_release_macos.sh -dpx -a ${{ inputs.arch }} -t 10.15 -1
+            ./build_release_macos.sh -dx -a universal -t 10.15 -1
+            for arch in arm64 x86_64; do
+                (cd "${{ github.workspace }}/deps/build/${arch}" && \
+                find . -mindepth 1 -maxdepth 1 ! -name 'OrcaSlicer_dep' -exec rm -rf {} +)
+            done
             brew install zstd
 
 
@@ -111,12 +113,12 @@ jobs:
 
 
       # Upload Artifacts
-      - name: Upload Mac ${{ inputs.arch }} artifacts
+      # - name: Upload Mac ${{ inputs.arch }} artifacts
-        if: inputs.os == 'macos-14'
+      #   if: inputs.os == 'macos-14'
-        uses: actions/upload-artifact@v4
+      #   uses: actions/upload-artifact@v4
-        with:
+      #   with:
-          name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
+      #     name: OrcaSlicer_dep_mac_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
         if: inputs.os == 'windows-latest'

.github/workflows/build_orca.yml

@@ -81,10 +81,9 @@ jobs:
       - name: Install tools mac
         if: inputs.os == 'macos-14'
         run: |
-          brew install ninja libtool
+          brew install libtool
           brew list
-          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
+          mkdir -p ${{ github.workspace }}/deps/build
-          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
 
       - name: Free disk space
         if: inputs.os == 'macos-14'
@@ -98,7 +97,7 @@ jobs:
         if: inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -x -a ${{inputs.arch}} -t 10.15 -1
+          ./build_release_macos.sh -s -n -x -a universal -t 10.15 -1
 
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
@@ -119,27 +118,27 @@ jobs:
           security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/OrcaSlicer.app
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app
-          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
+          ln -s /Applications ${{ github.workspace }}/build/universal/OrcaSlicer/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
-          xcrun notarytool submit "OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
+          xcrun notarytool submit "OrcaSlicer_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
-          xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          xcrun stapler staple OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
       - name: Create DMG without notary
         if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
-          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
+          ln -s /Applications ${{ github.workspace }}/build/universal/OrcaSlicer/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
       - name: Upload artifacts mac
         if: inputs.os == 'macos-14'
         uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
+          name: OrcaSlicer_Mac_universal_${{ env.ver }}
-          path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
       - name: Deploy Mac release
         if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
@@ -147,8 +146,8 @@ jobs:
         with:
           upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
-          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_name: OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           asset_content_type: application/octet-stream
           max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
 

build_release_macos.sh

@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-while getopts ":dpa:snt:xbc:hu" opt; do
+while getopts ":dpa:snt:xbc:h" opt; do
   case "${opt}" in
     d )
         export BUILD_TARGET="deps"
@@ -37,19 +37,15 @@ while getopts ":dpa:snt:xbc:hu" opt; do
     1 )
         export CMAKE_BUILD_PARALLEL_LEVEL=1
         ;;
-    u )
-        export BUILD_UNIVERSAL="1"
-        ;;
     h ) echo "Usage: ./build_release_macos.sh [-d]"
         echo "   -d: Build deps only"
-        echo "   -a: Set ARCHITECTURE (arm64 or x86_64)"
+        echo "   -a: Set ARCHITECTURE (arm64 or x86_64 or universal)"
         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 "   -b: Build without reconfiguring CMake"
         echo "   -c: Set CMake build configuration, default is Release"
-        echo "   -u: Build universal binary (both arm64 and x86_64)"
         echo "   -1: Use single job for building"
         exit 0
         ;;
@@ -61,16 +57,8 @@ done
 # Set defaults
 
 if [ -z "$ARCH" ]; then
-  if [ "1." == "$BUILD_UNIVERSAL". ]; then
-    ARCH="universal"
-  else
     ARCH="$(uname -m)"
-  fi
+    export ARCH
-  export ARCH
-fi
-
-if [ "1." == "$BUILD_UNIVERSAL". ]; then
-  echo "Universal build enabled - will create a combined arm64/x86_64 binary"
 fi
 
 if [ -z "$BUILD_CONFIG" ]; then
@@ -119,10 +107,10 @@ echo
 # fi
 
 PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
+PROJECT_BUILD_DIR="$PROJECT_DIR/build/$ARCH"
 DEPS_DIR="$PROJECT_DIR/deps"
-DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
+DEPS_BUILD_DIR="$DEPS_DIR/build/$ARCH"
-DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
+DEPS="$DEPS_BUILD_DIR/OrcaSlicer_deps"
 
 # Fix for Multi-config generators
 if [ "$SLICER_CMAKE_GENERATOR" == "Xcode" ]; then
@@ -132,133 +120,133 @@ else
 fi
 
 function build_deps() {
-    echo "Building deps..."
+    # iterate over two architectures: x86_64 and arm64
-    (
+    for _ARCH in x86_64 arm64; do
-        set -x
+        # if ARCH is universal or equal to _ARCH
-        mkdir -p "$DEPS"
+        if [ "$ARCH" == "universal" ] || [ "$ARCH" == "$_ARCH" ]; then
-        cd "$DEPS_BUILD_DIR"
+
-        if [ "1." != "$BUILD_ONLY". ]; then
+            PROJECT_BUILD_DIR="$PROJECT_DIR/build/$_ARCH"
-            cmake .. \
+            DEPS_BUILD_DIR="$DEPS_DIR/build/$_ARCH"
-                -G "${DEPS_CMAKE_GENERATOR}" \
+            DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep"
-                -DDESTDIR="$DEPS" \
+
-                -DOPENSSL_ARCH="darwin64-${ARCH}-cc" \
+            echo "Building deps..."
-                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
+            (
-                -DCMAKE_OSX_ARCHITECTURES:STRING="${ARCH}" \
+                set -x
-                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
+                mkdir -p "$DEPS"
+                cd "$DEPS_BUILD_DIR"
+                if [ "1." != "$BUILD_ONLY". ]; then
+                    cmake "${DEPS_DIR}" \
+                        -G "${DEPS_CMAKE_GENERATOR}" \
+                        -DDESTDIR="$DEPS" \
+                        -DOPENSSL_ARCH="darwin64-${_ARCH}-cc" \
+                        -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
+                        -DCMAKE_OSX_ARCHITECTURES:STRING="${_ARCH}" \
+                        -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
+                fi
+                cmake --build . --config "$BUILD_CONFIG" --target deps
+            )
         fi
-        cmake --build . --config "$BUILD_CONFIG" --target deps
+    done
-    )
 }
 
 function pack_deps() {
     echo "Packing deps..."
     (
         set -x
-        mkdir -p "$DEPS"
+        cd "$DEPS_DIR"
-        cd "$DEPS_BUILD_DIR"
+        tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "build"
-        tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "OrcaSlicer_dep_$ARCH"
     )
 }
 
 function build_slicer() {
-    echo "Building slicer..."
+    # iterate over two architectures: x86_64 and arm64
-    (
+    for _ARCH in x86_64 arm64; do
-        set -x
+        # if ARCH is universal or equal to _ARCH
-        mkdir -p "$PROJECT_BUILD_DIR"
+        if [ "$ARCH" == "universal" ] || [ "$ARCH" == "$_ARCH" ]; then
-        cd "$PROJECT_BUILD_DIR"
-        if [ "1." != "$BUILD_ONLY". ]; then
-            cmake .. \
-                -G "${SLICER_CMAKE_GENERATOR}" \
-                -DBBL_RELEASE_TO_PUBLIC=1 \
-                -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
-                -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
-                -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-                -DCMAKE_MACOSX_RPATH=ON \
-                -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
-                -DCMAKE_MACOSX_BUNDLE=ON \
-                -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
-                -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
-        fi
-        cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
-    )
 
-    echo "Verify localization with gettext..."
+            PROJECT_BUILD_DIR="$PROJECT_DIR/build/$_ARCH"
-    (
+            DEPS_BUILD_DIR="$DEPS_DIR/build/$_ARCH"
-        cd "$PROJECT_DIR"
+            DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep"
-        ./run_gettext.sh
-    )
 
-    echo "Fix macOS app package..."
+            echo "Building slicer for $_ARCH..."
-    (
+            (
-        cd "$PROJECT_BUILD_DIR"
+                set -x
-        mkdir -p OrcaSlicer
+            mkdir -p "$PROJECT_BUILD_DIR"
-        cd OrcaSlicer
+            cd "$PROJECT_BUILD_DIR"
-        # remove previously built app
+            if [ "1." != "$BUILD_ONLY". ]; then
-        rm -rf ./OrcaSlicer.app
+                cmake "${PROJECT_DIR}" \
-        # fully copy newly built app
+                    -G "${SLICER_CMAKE_GENERATOR}" \
-        cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
+                    -DBBL_RELEASE_TO_PUBLIC=1 \
-        # fix resources
+                    -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
-        resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
+                    -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
-        rm ./OrcaSlicer.app/Contents/Resources
+                    -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-        cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
+                    -DCMAKE_MACOSX_RPATH=ON \
-        # delete .DS_Store file
+                    -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
-        find ./OrcaSlicer.app/ -name '.DS_Store' -delete
+                    -DCMAKE_MACOSX_BUNDLE=ON \
-    )
+                    -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
+                    -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
+            fi
+            cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
+        )
 
-    # extract version
+        echo "Verify localization with gettext..."
-    # export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+        (
-    # ver="_V${ver//\"}"
+            cd "$PROJECT_DIR"
-    # echo $PWD
+            ./run_gettext.sh
-    # if [ "1." != "$NIGHTLY_BUILD". ];
+        )
-    # then
-    #     ver=${ver}_dev
-    # fi
 
-    # zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
+        echo "Fix macOS app package..."
+        (
+            cd "$PROJECT_BUILD_DIR"
+            mkdir -p OrcaSlicer
+            cd OrcaSlicer
+            # remove previously built app
+            rm -rf ./OrcaSlicer.app
+            # fully copy newly built app
+            cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
+            # fix resources
+            resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
+            rm ./OrcaSlicer.app/Contents/Resources
+            cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
+            # delete .DS_Store file
+            find ./OrcaSlicer.app/ -name '.DS_Store' -delete
+        )
+
+        # extract version
+        # export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+        # ver="_V${ver//\"}"
+        # echo $PWD
+        # if [ "1." != "$NIGHTLY_BUILD". ];
+        # then
+        #     ver=${ver}_dev
+        # fi
+
+        # zip -FSr OrcaSlicer${ver}_Mac_${_ARCH}.zip OrcaSlicer.app
+
+    fi
+    done
 }
 
 function build_universal() {
     echo "Building universal binary..."
-    # Save current ARCH
-    ORIGINAL_ARCH="$ARCH"
 
-    # Build x86_64
+    PROJECT_BUILD_DIR="$PROJECT_DIR/build/$ARCH"
-    ARCH="x86_64"
-    PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
-    DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
-    DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
-    build_deps
-    build_slicer
-    
-    # Build arm64
-    ARCH="arm64"
-    PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
-    DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
-    DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
-    build_deps
-    build_slicer
-    
-    # Restore original ARCH
-    ARCH="$ORIGINAL_ARCH"
-    PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
-    DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
-    DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
     
     # Create universal binary
     echo "Creating universal binary..."
-    PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
+    # PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
     mkdir -p "$PROJECT_BUILD_DIR/OrcaSlicer"
-    UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/Universal_OrcaSlicer.app"
+    UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer.app"
     rm -rf "$UNIVERSAL_APP"
-    cp -R "$PROJECT_DIR/build_x86_64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP"
+    cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP"
     
     # Get the binary path inside the .app bundle
     BINARY_PATH="Contents/MacOS/OrcaSlicer"
     
     # Create universal binary using lipo
     lipo -create \
-        "$PROJECT_DIR/build_x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
+        "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
-        "$PROJECT_DIR/build_arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
+        "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
         -output "$UNIVERSAL_APP/$BINARY_PATH"
         
     echo "Universal binary created at $UNIVERSAL_APP"
@@ -266,22 +254,14 @@ function build_universal() {
 
 case "${BUILD_TARGET}" in
     all)
-        if [ "1." == "$BUILD_UNIVERSAL". ]; then
+        build_deps
-            build_universal
+        build_slicer
-        else
-            build_deps
-            build_slicer
-        fi
         ;;
     deps)
         build_deps
         ;;
     slicer)
-        if [ "1." == "$BUILD_UNIVERSAL". ]; then
+        build_slicer
-            build_universal
-        else
-            build_slicer
-        fi
         ;;
     *)
         echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, all."
@@ -289,6 +269,10 @@ case "${BUILD_TARGET}" in
         ;;
 esac
 
+if [ "$ARCH" = "universal" ] && [ "$BUILD_TARGET" != "deps" ]; then
+    build_universal
+fi
+
 if [ "1." == "$PACK_DEPS". ]; then
     pack_deps
 fi

deps/CMakeLists.txt

@@ -45,7 +45,7 @@ if (NPROC EQUAL 0)
 endif ()
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
-set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
+set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/DL_CACHE CACHE PATH "Path for downloaded source packages.")
 set(FLATPAK FALSE CACHE BOOL "Toggles various build settings for flatpak, like /usr/local in DESTDIR or not building wxwidgets")
 if (NOT FLATPAK)
     set(DESTDIR "${DESTDIR}/usr/local/")