diff --git a/configure_ios.sh b/configure_ios.sh index abcbf70a2..c6b56c25f 100755 --- a/configure_ios.sh +++ b/configure_ios.sh @@ -20,8 +20,8 @@ prefixPath="$globalPrefix;$qtDir" srcDir="../vcmi" # cmake "$srcDir" -G Xcode -T buildsystem=1 \ cmake "$srcDir" -G Xcode \ + -DFORCE_BUNDLED_MINIZIP=ON \ -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \ - -DENABLE_PCH=OFF \ -Wno-dev \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d21408085..62da10ae9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -498,7 +498,13 @@ if(APPLE_IOS) if(TARGET ${LINKED_LIB}) get_target_property(LIB_TYPE ${LINKED_LIB} TYPE) 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() else() if(LINKED_LIB MATCHES "\\${CMAKE_SHARED_LIBRARY_SUFFIX}$")