aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+wangli28@users.noreply.github.com>2019-08-03 01:08:00 +0800
committerVictor Romero <romerosanchezv@gmail.com>2019-08-02 10:08:00 -0700
commit095fecf85c2beb75f860c37a124ec3e2325478e4 (patch)
treeaa181e7db1264f4d26d6ac906d4565387602a9cf
parent165907550c8f6ce7506beef591f55cd3f8458d78 (diff)
downloadvcpkg-095fecf85c2beb75f860c37a124ec3e2325478e4.tar.gz
vcpkg-095fecf85c2beb75f860c37a124ec3e2325478e4.zip
[gdal] Fix duplicate pdb file (#7520)
-rw-r--r--ports/gdal/CONTROL2
-rw-r--r--ports/gdal/portfile.cmake4
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 5df9a7fa2..bf5acc08d 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,5 +1,5 @@
Source: gdal
-Version: 2.4.1-5
+Version: 2.4.1-7
Homepage: https://gdal.org/
Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 61609d3d3..e212a42ed 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -324,6 +324,10 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
# Copy over PDBs
vcpkg_copy_pdbs()
+
+ if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb)
+ endif()
elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") # Build in UNIX
# Check build system first