try fix win,ios,android

MerginMaps · Aug 23, 2023 · f8fcb56 · f8fcb56
1 parent 4b9efe8
commit f8fcb56
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/vcpkg-overlay/ports/gdal/portfile.cmake b/vcpkg-overlay/ports/gdal/portfile.cmake
@@ -64,8 +64,8 @@ string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r
 # PCIDSK does not add compile interface defininions!
 # do this instead of patching for now
 # https://github.com/OSGeo/gdal/blob/af5b75ecc6b8d3cef36f2b6fecf085319d39a546/frmts/pcidsk/sdk/CMakeLists.txt#L84
-string(APPEND VCPKG_C_FLAGS "-DRENAME_INTERNAL_LIBJPEG_SYMBOLS")
-string(APPEND VCPKG_CXX_FLAGS "-DRENAME_INTERNAL_LIBJPEG_SYMBOLS")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -DRENAME_INTERNAL_LIBJPEG_SYMBOLS")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -DRENAME_INTERNAL_LIBJPEG_SYMBOLS")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

diff --git a/vcpkg-overlay/ports/libjpeg-turbo/CMakeLists.txt b/vcpkg-overlay/ports/libjpeg-turbo/CMakeLists.txt
@@ -76,5 +76,16 @@ target_compile_definitions(jpeg PUBLIC -DRENAME_INTERNAL_LIBJPEG_SYMBOLS)
 configure_file(libjpeg.pc.in libjpeg.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libjpeg.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
 
-INSTALL(TARGETS jpeg)
+IF(WIN32)
+	INSTALL(TARGETS jpeg
+    	RUNTIME DESTINATION bin
+        ARCHIVE DESTINATION lib
+    )
+ELSE(WIN32)
+    INSTALL(TARGETS jpeg
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+    )
+ENDIF(WIN32)
+
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION include FILES_MATCHING PATTERN "*.h")