mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa
generate ipa file with CPack directly
This commit is contained in:
commit
18c52f05ca
@ -1,3 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
"$1/ios/zip2ipa.sh" "$2"
|
@ -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()
|
||||
|
@ -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()
|
||||
|
@ -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"
|
Loading…
Reference in New Issue
Block a user