diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/dependency_win.cmake | 11 |
2 files changed, 4 insertions, 9 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()
|