diff --git a/CMakeLists.txt b/CMakeLists.txt index 105548ecd..4d08500ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ if (IOS) set(PLATFORM "OS") set(ENABLE_ARC FALSE) set(ENABLE_BITCODE FALSE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "16.0") # when changed change triplets arm64-ios.cmake + set(CMAKE_OSX_DEPLOYMENT_TARGET "17.0") # when changed change triplets arm64-ios.cmake endif () if (APPLE AND NOT IOS) diff --git a/INSTALL.md b/INSTALL.md index 76259ca11..d63d1befb 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -523,6 +523,15 @@ build_folder/ Once the project is opened, build it from Xcode. +Or build the project via cmake and execute Xcode commands on Commandline: + +```bash + xcrun devicectl list devices + xcrun devicectl device install app --device 4EA89BF3-XXXXXXXX-XXXXXXXX ./build_folder/app/RelWithDebInfo-iphoneos/MerginMaps.app + xcrun devicectl device process launch --console --device 4EA89BF3-XXXXXXXX-XXXXXXXX file:///private/var/containers/Bundle/Application/2DB39FCE-XXXXXXXX-XXXXXXXX/MerginMaps.app/ +``` +the link used in 3rd line is the one returned by 2nd command + # 6. Building macOS 1. Install some dependencies, critically XCode, bison and flex. See "Install Build Dependencies" step in `.github/workflows/macos.yml` diff --git a/vcpkg.json b/vcpkg.json index 05878aed5..1950e7209 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -84,7 +84,10 @@ }, { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "sessionmanager" + ] }, "qtconnectivity", "qtdeclarative", diff --git a/vcpkg/triplets/arm64-ios.cmake b/vcpkg/triplets/arm64-ios.cmake index c8288d6ef..fc8b1c810 100644 --- a/vcpkg/triplets/arm64-ios.cmake +++ b/vcpkg/triplets/arm64-ios.cmake @@ -4,7 +4,7 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME iOS) set(VCPKG_OSX_ARCHITECTURES arm64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 16.0) +set(VCPKG_OSX_DEPLOYMENT_TARGET 17.0) set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-apple-ios${VCPKG_OSX_DEPLOYMENT_TARGET}") set(VCPKG_BUILD_TYPE release)