games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

fix using local minizip after rebase

Browse Source
This commit is contained in:
Andrey Filipenkov
2022-06-26 16:02:50 +03:00
parent d69d2c705f
commit 27551a9eae
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure_ios.sh
View File

@@ -20,8 +20,8 @@ prefixPath="$globalPrefix;$qtDir"
srcDir="../vcmi" srcDir="../vcmi"
# cmake "$srcDir" -G Xcode -T buildsystem=1 \ # cmake "$srcDir" -G Xcode -T buildsystem=1 \
cmake "$srcDir" -G Xcode \ cmake "$srcDir" -G Xcode \
-DFORCE_BUNDLED_MINIZIP=ON \
-DBUNDLE_IDENTIFIER_PREFIX=com.kambala \ -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \
-DENABLE_PCH=OFF \
-Wno-dev \ -Wno-dev \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \ -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \

8
lib/CMakeLists.txt
View File

@@ -498,7 +498,13 @@ if(APPLE_IOS)
if(TARGET ${LINKED_LIB}) if(TARGET ${LINKED_LIB})
get_target_property(LIB_TYPE ${LINKED_LIB} TYPE) get_target_property(LIB_TYPE ${LINKED_LIB} TYPE)
if(LIB_TYPE STREQUAL "SHARED_LIBRARY") if(LIB_TYPE STREQUAL "SHARED_LIBRARY")
install(TARGETS ${LINKED_LIB} LIBRARY DESTINATION ${LIB_DIR} COMPONENT core) get_target_property(_aliased ${LINKED_LIB} ALIASED_TARGET)
if(_aliased)
set(LINKED_LIB_REAL ${_aliased})
else()
set(LINKED_LIB_REAL ${LINKED_LIB})
endif()
install(TARGETS ${LINKED_LIB_REAL} LIBRARY DESTINATION ${LIB_DIR} COMPONENT core)
endif() endif()
else() else()
if(LINKED_LIB MATCHES "\\${CMAKE_SHARED_LIBRARY_SUFFIX}$") if(LINKED_LIB MATCHES "\\${CMAKE_SHARED_LIBRARY_SUFFIX}$")