games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa

Browse Source 
generate ipa file with CPack directly
This commit is contained in:
Andrey Filipenkov 2023-01-25 17:41:10 +03:00 committed by GitHub
commit 18c52f05ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CI/ios/post_pack.sh
View File

@ -1,3 +0,0 @@
#!/usr/bin/env bash
"$1/ios/zip2ipa.sh" "$2"

1
CMakeLists.txt
View File

@ -621,6 +621,7 @@ elseif(APPLE_MACOS AND NOT ENABLE_MONOLITHIC_INSTALL)
add_subdirectory(osx)
elseif(APPLE_IOS)
set(CPACK_GENERATOR ZIP)
set(CPACK_ARCHIVE_FILE_EXTENSION ipa)
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_PROJECT_NAME};app;/")
else()

3
client/CMakeLists.txt
View File

@ -234,8 +234,7 @@ elseif(APPLE_IOS)
set_source_files_properties(${XCODE_RESOURCE_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# workaround to prevent CMAKE_SKIP_PRECOMPILE_HEADERS being added as compile flag
# add max version condition when https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7562 is merged
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.22.0")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.22.0" AND CMAKE_VERSION VERSION_LESS "3.25.0")
set_source_files_properties(${XCODE_RESOURCE_PATH} PROPERTIES LANGUAGE CXX)
endif()
endforeach()

9
ios/zip2ipa.sh
View File

@ -1,9 +0,0 @@
#!/usr/bin/env bash
generatedZip="$1"
if [[ -z "$generatedZip" ]]; then
echo 'generated zip not provided as param'
exit 1
fi
mv "$generatedZip" "$(basename "$generatedZip" .zip).ipa"