浏览代码

fix using local minizip after rebase

Andrey Filipenkov 3 年之前
父节点
当前提交
27551a9eae
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 1 1
      configure_ios.sh
  2. 7 1
      lib/CMakeLists.txt

+ 1 - 1
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" \

+ 7 - 1
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}$")