diff options
| author | ankurverma85 <31362771+ankurverma85@users.noreply.github.com> | 2021-01-26 14:54:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 14:54:05 -0800 |
| commit | 60d7d91c7105a2ba821a450ea4ba336dfbf14719 (patch) | |
| tree | 91d1f738d32f293dcc1fe51bcd1c5ec88830a0a9 | |
| parent | 80d52af7c8fbdf817a162bacf110d1526d85daf6 (diff) | |
| download | vcpkg-60d7d91c7105a2ba821a450ea4ba336dfbf14719.tar.gz vcpkg-60d7d91c7105a2ba821a450ea4ba336dfbf14719.zip | |
gdal:x64-windows-static-md fixes (#15541)
* Fix windows-static builds
* Rename debug lib to comform to other naming scheme
* Update ci.baseline.txt
* Update CONTROL
* Update dependency_win.cmake
* Update portfile.cmake
* Update vcpkg-cmake-wrapper.cmake
* Update portfile.cmake
* Added versions
* Update ci.baseline.txt
* PR comments
* update gdal portversion
Co-authored-by: Ankur Verma <ankur.veram@outlook.com>
Co-authored-by: ankurv <ankurv@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/dependency_win.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/gdal.json | 5 |
5 files changed, 10 insertions, 11 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 36944edce..548232fb6 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,6 +1,6 @@ Source: gdal Version: 3.1.3 -Port-Version: 1 +Port-Version: 2 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, libgeotiff, cfitsio, json-c (!windows) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index 0d9dfa533..c18bc9b2d 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -22,13 +22,8 @@ macro(find_dependency_win) # Setup expat libraries + include path
set(EXPAT_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" )
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
- set(EXPAT_SUFFIX "MT")
- else()
- set(EXPAT_SUFFIX "MD")
- endif()
- set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat${EXPAT_SUFFIX}.lib" )
- set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd${EXPAT_SUFFIX}.lib" )
+ set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib" )
+ set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib" )
else()
set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" )
set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" )
@@ -117,4 +112,4 @@ macro(find_dependency_win) set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" )
set(HAVE_SPATIALITE "-DHAVE_SPATIALITE")
endif()
-endmacro()
\ No newline at end of file +endmacro()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7a2d1b00b..ea21ced9a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -349,7 +349,6 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail -gdal:x64-windows-static-md=fail geos:arm-uwp=fail geos:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 75aa6ea4a..5144e658f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2074,7 +2074,7 @@ }, "gdal": { "baseline": "3.1.3", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index c0a48048b..8ed4f6349 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "162ae61cb64d9bb9a485e611cca106ade9062c1a", + "version-string": "3.1.3", + "port-version": 2 + }, + { "git-tree": "fc7d76bf3899b89791a7699037bed3532cdc0c60", "version-string": "3.1.3", "port-version": 1 |