diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index f7a16b7b610..c9e6d36c526 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -71,11 +71,13 @@ jobs: working-directory: ${{ github.workspace }} run: | brew install cmake git gettext automake - brew uninstall --ignore-dependencies zstd 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 -dp -a ${{ inputs.arch }} + brew install zstd + - name: Build on Ubuntu if: inputs.os == 'ubuntu-20.04' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index b629f27de2c..58bd3e1b843 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -77,7 +77,6 @@ jobs: if: inputs.os == 'macos-12' run: | brew install cmake git gettext tree - brew uninstall --ignore-dependencies zstd brew list mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}} mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}} diff --git a/CMakeLists.txt b/CMakeLists.txt index a29560220ed..dffd6807d99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ if (APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer") + message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}") endif () # Proposal for C++ unit tests and sandboxes