Libspatialite remove cflags from vcpkg_configure_make options (#17024)

* remove CFLAGS from options

* x-add-version libspatialite

Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
This commit is contained in:
Ilya Arzhannikov 2021-04-07 22:03:53 +02:00 committed by GitHub
parent f716880bf6
commit 3c21d6fa7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,6 @@
Source: libspatialite Source: libspatialite
Version: 5.0.0 Version: 5.0.0
Port-Version: 1
Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources
Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.
Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo

View File

@ -105,7 +105,6 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG AUTOCONFIG
OPTIONS OPTIONS
"CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
"LIBS=-lpthread -ldl -lm -l${STDLIB}" "LIBS=-lpthread -ldl -lm -l${STDLIB}"
"LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\""
"--enable-rttopo" "--enable-rttopo"
@ -124,4 +123,4 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
endif() endif()
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

View File

@ -3466,7 +3466,7 @@
}, },
"libspatialite": { "libspatialite": {
"baseline": "5.0.0", "baseline": "5.0.0",
"port-version": 0 "port-version": 1
}, },
"libspnav": { "libspnav": {
"baseline": "0.2.3", "baseline": "0.2.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b713a9368a0d53629cd8497cc82107ea6a33e980",
"version-string": "5.0.0",
"port-version": 1
},
{ {
"git-tree": "f63638cb7e228e76cebf7e4a6c28902b4738f907", "git-tree": "f63638cb7e228e76cebf7e4a6c28902b4738f907",
"version-string": "5.0.0", "version-string": "5.0.0",