mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:49:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline][gdal] Fix quote variable error (#33332)

Browse Source 
* [vcpkg baseline][gdal] Fix  quote variable error

* update version

---------

Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
This commit is contained in:
JonLiu1993 2023-08-23 21:36:28 -07:00 committed by GitHub
parent da7048d0d9
commit 24acb5f356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/gdal/Fix-quote-variable.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake
index fa72773..813cca3 100644
--- a/cmake/modules/packages/FindSPATIALITE.cmake
+++ b/cmake/modules/packages/FindSPATIALITE.cmake
@@ -64,7 +64,7 @@ if(SPATIALITE_LIBRARY AND SPATIALITE_INCLUDE_DIR
AND NOT SPATIALITE_VERSION_STRING)
file(STRINGS "${SPATIALITE_INCLUDE_DIR}/spatialite.h" _spatialite_h_ver
REGEX "^[ \t]version[ \t]([0-9]+\\.[0-9]+),.*")
- string(REGEX REPLACE "[ \t]version[ \t]([0-9]+\\.[0-9]+),.*" "\\1" _spatialite_h_ver ${_spatialite_h_ver})
+ string(REGEX REPLACE "[ \t]version[ \t]([0-9]+\\.[0-9]+),.*" "\\1" _spatialite_h_ver "${_spatialite_h_ver}")
set(SPATIALITE_VERSION_STRING "${_spatialite_h_ver}")
endif()

1
ports/gdal/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
find-link-libraries.patch
fix-gdal-target-interfaces.patch
libkml.patch
Fix-quote-variable.patch
)
# `vcpkg clean` stumbles over one subdir
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")

2
ports/gdal/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "gdal",
"version-semver": "3.7.1",
"port-version": 2,
"port-version": 3,
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,

2
versions/baseline.json
View File

@ -2790,7 +2790,7 @@
},
"gdal": {
"baseline": "3.7.1",
"port-version": 2
"port-version": 3
},
"gdcm": {
"baseline": "3.0.22",

5
versions/g-/gdal.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1bffcf8c8f2b02ed041a099723115cbbd0c39b2c",
"version-semver": "3.7.1",
"port-version": 3
},
{
"git-tree": "fe574600c39e044d7aa3f4a0e58c1de47f95a430",
"version-semver": "3.7.1",