diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-12 12:03:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 12:03:08 -0700 |
| commit | 6cc5c2c70e381d378100c2f77f92d12bb94f277d (patch) | |
| tree | f4e2e78774c0372740addc22568204b1cc525af0 | |
| parent | d1ba685e975db41d767af5676ca2669a5e7e6ad9 (diff) | |
| download | vcpkg-6cc5c2c70e381d378100c2f77f92d12bb94f277d.tar.gz vcpkg-6cc5c2c70e381d378100c2f77f92d12bb94f277d.zip | |
[gdal] Fix debug library name in vcpkg-cmake-wrapper (#13992)
* [gdal] Fix debug library name in vcpkg-cmake-wrapper
* correct debug library name on Windows
* correct library name on Windows
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/vcpkg-cmake-wrapper.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 36d3510fc..38a1e266a 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,6 +1,6 @@ Source: gdal Version: 2.4.1 -Port-Version: 12 +Port-Version: 13 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index ba3c6926e..89550ddf8 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -3,10 +3,10 @@ include(SelectLibraryConfigurations) find_path(GDAL_INCLUDE_DIR NAMES gdal.h HINTS ${CURRENT_INSTALLED_DIR})
-find_library(GDAL_LIBRARY_DEBUG NAMES gdald libgdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(GDAL_LIBRARY_RELEASE NAMES gdal libgdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
+find_library(GDAL_LIBRARY_DEBUG NAMES gdal gdald NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
+find_library(GDAL_LIBRARY_RELEASE NAMES gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
select_library_configurations(GDAL)
set(GDAL_INCLUDE_DIR ${GDAL_INCLUDE_DIR})
-set(GDAL_LIBRARY ${GDAL_LIBRARY})
\ No newline at end of file +set(GDAL_LIBRARY ${GDAL_LIBRARY})
|