diff options
| author | Zheng Xueke <46664191+xiaoke0O@users.noreply.github.com> | 2021-10-12 01:33:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 10:33:21 -0700 |
| commit | 5d191e6cb3a05ae832dc2988bffec45695bed0ad (patch) | |
| tree | 6b7d0a824b207ce91f105fd85908594fd8f07532 | |
| parent | ad6bce211e3d5e0bdfcbc32391e2e011e93d5f7a (diff) | |
| download | vcpkg-5d191e6cb3a05ae832dc2988bffec45695bed0ad.tar.gz vcpkg-5d191e6cb3a05ae832dc2988bffec45695bed0ad.zip | |
[gdal] add hdf5 support on windows (#20540)
* add gdal hdf5 format support on windows
* add gdal hdf5 format support on windows:run x-add-version
* remove lib EXISTS check
Co-authored-by: Billy O'Neal <bion@microsoft.com>
* remove lib EXISTS check : fix git-tree
* Delete ports/gdal/dependency_win.cmake extra Spaces
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* delete unnecessary blank lines： update git-tree
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
| -rw-r--r-- | ports/gdal/dependency_win.cmake | 12 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/gdal/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/gdal.json | 5 |
5 files changed, 21 insertions, 6 deletions
diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index 6bb6202d2..c9c81ec1e 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -94,7 +94,7 @@ macro(find_dependency_win) if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" JPEG_INCLUDE)
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib" JPEG_LIBRARY_REL)
- file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpegd.lib" JPEG_LIBRARY_DBG)
+ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpeg.lib" JPEG_LIBRARY_DBG)
list(APPEND NMAKE_OPTIONS JPEG_EXTERNAL_LIB=1)
list(APPEND NMAKE_OPTIONS JPEGDIR=${JPEG_INCLUDE})
list(APPEND NMAKE_OPTIONS_REL JPEG_LIB=${JPEG_LIBRARY_REL})
@@ -178,6 +178,16 @@ macro(find_dependency_win) list(APPEND NMAKE_OPTIONS_DBG NETCDF_LIB=${NETCDF_LIBRARY_DBG})
endif()
endif()
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR)
+ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/hdf5_D.lib" HDF5_LIBRARY_DBG)
+ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/hdf5.lib" HDF5_LIBRARY_REL)
+ list(APPEND NMAKE_OPTIONS HDF5_PLUGIN=NO)
+ list(APPEND NMAKE_OPTIONS HDF5_H5_IS_DLL=YES)
+ list(APPEND NMAKE_OPTIONS HDF5_DIR=${HDF5_DIR})
+ list(APPEND NMAKE_OPTIONS_REL HDF5_LIB=${HDF5_LIBRARY_REL})
+ list(APPEND NMAKE_OPTIONS_DBG HDF5_LIB=${HDF5_LIBRARY_DBG})
+ endif()
# Setup libkml libraries
if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib")
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 10d1e42fc..e3268d31f 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -32,13 +32,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() - set(NMAKE_OPTIONS "") set(NMAKE_OPTIONS_REL "") set(NMAKE_OPTIONS_DBG "") + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 12e83cb84..a0200858d 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 5, + "port-version": 6, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index a1adb4c6c..ca60196de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2322,7 +2322,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 5 + "port-version": 6 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index bf73dab76..732c1533e 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "15009f5f5d2867c594d8148d79cccbe964432465", + "version-semver": "3.2.2", + "port-version": 6 + }, + { "git-tree": "3f821ae473a38c3ceac861552f560da4a9109ff8", "version-semver": "3.2.2", "port-version": 5 |