aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshelltdf <shell_tdf@126.com>2019-03-13 06:58:40 +0800
committerPhil Christensen <philc@microsoft.com>2019-03-12 15:58:40 -0700
commit99ec3727557a34ce11f6534a509e205d9044c3a7 (patch)
treec8f8fc31fc0f3c90e9206f1d7aaa22c76a4c6f3f
parentb4a64cca36bfc770bc9102db7ff49fb6ba090fc8 (diff)
downloadvcpkg-99ec3727557a34ce11f6534a509e205d9044c3a7.tar.gz
vcpkg-99ec3727557a34ce11f6534a509e205d9044c3a7.zip
install gdal tools (#5644)
-rw-r--r--ports/gdal/portfile.cmake11
1 files changed, 9 insertions, 2 deletions
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index d1ae296af..95029884a 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -250,8 +250,15 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
endif()
else()
- file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
- file(REMOVE ${EXE_FILES} ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
+
+ set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal)
+ file(MAKE_DIRECTORY ${GDAL_TOOL_PATH})
+
+ file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+ file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH})
+ file(REMOVE_RECURSE ${GDAL_TOOLS})
+
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)