From 1319c8f19764351cfb8f598af4494d6999eb1caa Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 27 Jun 2022 13:02:39 +0300 Subject: [PATCH] fix building Client with the latest cmake for some reason cmake injects compile flag to Client's resources which breaks ibtool call --- client/LaunchScreen.storyboard | 2 +- configure_ios.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/LaunchScreen.storyboard b/client/LaunchScreen.storyboard index ea997175d..14b2fa354 100644 --- a/client/LaunchScreen.storyboard +++ b/client/LaunchScreen.storyboard @@ -2,7 +2,7 @@ - + diff --git a/configure_ios.sh b/configure_ios.sh index c6b56c25f..c57500617 100755 --- a/configure_ios.sh +++ b/configure_ios.sh @@ -26,10 +26,16 @@ cmake "$srcDir" -G Xcode \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \ -DPLATFORM=$platform \ - -DDEPLOYMENT_TARGET=11.0 \ + -DDEPLOYMENT_TARGET=12.0 \ -DENABLE_BITCODE=OFF \ -DCMAKE_BINARY_DIR=$(pwd) \ -DCMAKE_PREFIX_PATH="$prefixPath" \ -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY='Apple Development' \ -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM='4XHN44TEVG' # -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO + +# workaround strange cmake bug that adds compile flag to resources +sed -i '' \ + -e 's|\.storyboard \*/; settings = {COMPILER_FLAGS = "-DCMAKE_SKIP_PRECOMPILE_HEADERS "; };|.storyboard */;|g' \ + -e 's|\.xcassets \*/; settings = {COMPILER_FLAGS = "-DCMAKE_SKIP_PRECOMPILE_HEADERS "; };|.xcassets */;|g' \ + VCMI.xcodeproj/project.pbxproj