Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 9 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a name="building-macos"></a>

1. Install some dependencies, critically XCode, bison and flex. See "Install Build Dependencies" step in `.github/workflows/macos.yml`
Expand Down
5 changes: 4 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@
},
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"sessionmanager"
]
},
"qtconnectivity",
"qtdeclarative",
Expand Down
2 changes: 1 addition & 1 deletion vcpkg/triplets/arm64-ios.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading