From 48032632a6dcd5e978480397fe88a014473095ea Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Fri, 30 Dec 2022 14:19:37 +0800 Subject: [PATCH] generate Xcode project instead Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> --- CMakeLists.txt | 2 +- build_release_macos.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a6f3fb3f2..c81c693652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ if (APPLE) if (CMAKE_MACOSX_BUNDLE) set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks) endif() - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) endif () # Proposal for C++ unit tests and sandboxes diff --git a/build_release_macos.sh b/build_release_macos.sh index 11ef0d1f66..d4c9bb7ffb 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -7,14 +7,14 @@ cd build DEPS=$PWD/BambuStudio_dep mkdir -p $DEPS cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-$(uname -m)-cc" -DCMAKE_BUILD_TYPE=Release -make -j10 +cmake --build . --config Release --target ALL_BUILD cd $WD mkdir -p build cd build -cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -cmake --build . --config Release --target all -j10 -cmake --build . --target install --config Release -j10 -cd BambuStudio-SoftFever -cp -r bin/BambuStudio.app/Contents/MacOS BambuStudio.app/Contents -cp -r bin/BambuStudio.app/Contents/Info.plist BambuStudio.app/Contents/ +cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON +cmake --build . --config Release --target ALL_BUILD +# cmake --build . --target install --config Release +# cd BambuStudio-SoftFever +# cp -r bin/BambuStudio.app/Contents/MacOS BambuStudio.app/Contents +# cp -r bin/BambuStudio.app/Contents/Info.plist BambuStudio.app/Contents/