From 65354da5f141e17632f95a1ca2be07023e152ab0 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Mon, 2 Oct 2023 00:09:25 +0200 Subject: [PATCH] Add CMake preset for iOS build without precompiled headers, which is required for ccache --- .github/workflows/github.yml | 2 +- CMakePresets.json | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 1fbc2a4b7..c5f18fe29 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -103,7 +103,7 @@ jobs: test: 0 pack: 1 extension: ipa - preset: ios-release-conan + preset: ios-release-conan-ccache conan_profile: ios-arm64 conan_options: --options with_apple_system_libs=True - platform: msvc diff --git a/CMakePresets.json b/CMakePresets.json index 34a93a199..37c321522 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -217,7 +217,19 @@ "inherits": [ "base-ios-release", "ios-device-conan" - ] + ], + "cacheVariables": { + "ENABLE_PCH" : "ON" + } + }, + { + "name": "ios-release-conan-ccache", + "displayName": "iOS+Conan release using ccache", + "description": "VCMI iOS release using Conan and ccache", + "inherits": "ios-release-conan", + "cacheVariables": { + "ENABLE_PCH" : "OFF" + } }, { "name": "ios-release-legacy", @@ -327,6 +339,11 @@ "CODE_SIGNING_ALLOWED_FOR_APPS=NO" ] }, + { + "name": "ios-release-conan-ccache", + "configurePreset": "ios-release-conan-ccache", + "inherits": "ios-release-conan" + }, { "name": "ios-release-legacy", "configurePreset": "ios-release-legacy",