mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 14:15:51 +08:00
[spatialite-tools] Revise and update to 5.0.1 (#21594)
* Revise portfile and patch * Install pc file for windows * Update versions * Remove readosm failure from CI baseline * Revise dependencies based on #include, use pkgconfig * Revise portfile * Update to 5.0.1 * Update versions * Fix release-only nmake build * Update versions
This commit is contained in:
Kai Pastor
GitHub
parent
63e935d967
commit
4c9b301c9e
@ -37,10 +37,8 @@ diff --git a/nmake.opt b/nmake.opt
|
||||
index 5e45c0e..61c44f9 100644
|
||||
--- a/nmake.opt
|
||||
+++ b/nmake.opt
|
||||
@@ -1,8 +1,8 @@
|
||||
# Directory tree where ReadOSM will be installed.
|
||||
-INSTDIR=C:\OSGeo4W
|
||||
+INSTDIR=$(INST_DIR)
|
||||
@@ -2,7 +2,7 @@
|
||||
INSTDIR=C:\OSGeo4W
|
||||
|
||||
# Uncomment the first for an optimized build, or the second for debug.
|
||||
-OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
|
||||
|
||||
12
ports/readosm/pc-file.patch
Normal file
12
ports/readosm/pc-file.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/readosm.pc.in b/readosm.pc.in
|
||||
index c1a0961..2417433 100644
|
||||
--- a/readosm.pc.in
|
||||
+++ b/readosm.pc.in
|
||||
@@ -8,5 +8,6 @@ includedir=@includedir@
|
||||
Name: readosm
|
||||
Description: a simple library parsing Open Street Map files
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -lreadosm -lz -lexpat
|
||||
+Requires.private: expat zlib
|
||||
+Libs: -L${libdir} -lreadosm
|
||||
Cflags: -I${includedir}
|
||||
@ -1,89 +1,94 @@
|
||||
set(READOSM_VERSION_STR "1.1.0a")
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz"
|
||||
URLS "https://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz"
|
||||
FILENAME "readosm-${READOSM_VERSION_STR}.tar.gz"
|
||||
SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682
|
||||
)
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
vcpkg_extract_source_archive(SOURCE_PATH
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
PATCHES
|
||||
fix-makefiles.patch
|
||||
)
|
||||
pc-file.patch
|
||||
)
|
||||
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
|
||||
set(CL_FLAGS_DBG "/MDd /Zi")
|
||||
set(CL_FLAGS_REL "/MD /Ox")
|
||||
set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib")
|
||||
set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib")
|
||||
else()
|
||||
set(CL_FLAGS_DBG "/MTd /Zi")
|
||||
set(CL_FLAGS_REL "/MT /Ox")
|
||||
set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib")
|
||||
set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib")
|
||||
endif()
|
||||
set(PKGCONFIG_MODULES expat zlib)
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(UWP_LIBS windowsapp.lib)
|
||||
set(UWP_LINK_FLAGS /APPCONTAINER)
|
||||
endif()
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
x_vcpkg_pkgconfig_get_modules(
|
||||
PREFIX PKGCONFIG
|
||||
MODULES --msvc-syntax ${PKGCONFIG_MODULES}
|
||||
LIBS
|
||||
)
|
||||
|
||||
set(LIBS_ALL_DBG
|
||||
"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \
|
||||
${UWP_LIBS} \
|
||||
${EXPAT_LIBS_DBG}"
|
||||
)
|
||||
set(LIBS_ALL_REL
|
||||
"${CURRENT_INSTALLED_DIR}/lib/zlib.lib \
|
||||
${UWP_LIBS} \
|
||||
${EXPAT_LIBS_REL}"
|
||||
)
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(UWP_LIBS windowsapp.lib)
|
||||
set(UWP_LINK_FLAGS /APPCONTAINER)
|
||||
endif()
|
||||
|
||||
string(REPLACE "/" "\\\\" INST_DIR ${CURRENT_PACKAGES_DIR})
|
||||
list(APPEND OPTIONS_RELEASE
|
||||
"LINK_FLAGS=${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
|
||||
)
|
||||
list(APPEND OPTIONS_DEBUG
|
||||
"LINK_FLAGS=${UWP_LINK_FLAGS} /debug" "INST_DIR=${INST_DIR}\\debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
|
||||
)
|
||||
file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR)
|
||||
|
||||
vcpkg_install_nmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS_RELEASE
|
||||
${OPTIONS_RELEASE}
|
||||
OPTIONS_DEBUG
|
||||
${OPTIONS_DEBUG}
|
||||
)
|
||||
vcpkg_install_nmake(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS_RELEASE
|
||||
"INSTDIR=${INST_DIR}"
|
||||
"LINK_FLAGS=${UWP_LINK_FLAGS}"
|
||||
"LIBS_ALL=${PKGCONFIG_LIBS_RELEASE} ${UWP_LIBS}"
|
||||
OPTIONS_DEBUG
|
||||
"INSTDIR=${INST_DIR}\\debug"
|
||||
"LINK_FLAGS=${UWP_LINK_FLAGS} /debug"
|
||||
"LIBS_ALL=${PKGCONFIG_LIBS_DEBUG} ${UWP_LIBS}"
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib)
|
||||
else()
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/readosm.lib)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/lib/readosm.lib)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib)
|
||||
endif()
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
|
||||
vcpkg_extract_source_archive_ex(
|
||||
ARCHIVE ${ARCHIVE}
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib")
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE)
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib")
|
||||
endif()
|
||||
else()
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm.lib")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/lib/readosm.lib")
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE)
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib")
|
||||
endif()
|
||||
endif()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
AUTOCONFIG
|
||||
OPTIONS
|
||||
"LIBS=-lpthread -ldl -lstdc++ -lm"
|
||||
)
|
||||
set(infile "${SOURCE_PATH}/readosm.pc.in")
|
||||
set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/readosm.pc")
|
||||
set(VERSION "${READOSM_VERSION_STR}")
|
||||
set(exec_prefix [[${prefix}]])
|
||||
set(libdir [[${prefix}/lib]])
|
||||
set(includedir [[${prefix}/include]])
|
||||
list(JOIN pkg_config_modules " " requires_private)
|
||||
configure_file("${infile}" "${outfile}" @ONLY)
|
||||
if(NOT DEFINED VCPKG_BUILD_TYPE)
|
||||
set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/readosm.pc")
|
||||
set(includedir [[${prefix}/../include]])
|
||||
configure_file("${infile}" "${outfile}" @ONLY)
|
||||
endif()
|
||||
|
||||
vcpkg_install_make()
|
||||
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
|
||||
else()
|
||||
x_vcpkg_pkgconfig_get_modules(
|
||||
PREFIX PKGCONFIG
|
||||
MODULES ${PKGCONFIG_MODULES}
|
||||
LIBS
|
||||
)
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
AUTOCONFIG
|
||||
OPTIONS_RELEASE
|
||||
"LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS"
|
||||
OPTIONS_DEBUG
|
||||
"LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS"
|
||||
)
|
||||
|
||||
vcpkg_install_make()
|
||||
endif()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
# 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)
|
||||
@ -1,11 +1,15 @@
|
||||
{
|
||||
"name": "readosm",
|
||||
"version-string": "1.1.0a",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)",
|
||||
"homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources",
|
||||
"dependencies": [
|
||||
"expat",
|
||||
{
|
||||
"name": "vcpkg-pkgconfig-get-modules",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ff15f2922..c254b3619 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -142,6 +142,7 @@ fi
|
||||
AC_ARG_WITH([geosconfig],
|
||||
[AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])],
|
||||
[GEOSCONFIG="$withval"], [GEOSCONFIG=""])
|
||||
+if 0; then
|
||||
if test "x$GEOSCONFIG" = "x"; then
|
||||
# GEOSCONFIG was not specified, so search within the current path
|
||||
AC_PATH_PROG([GEOSCONFIG], [geos-config])
|
||||
@@ -164,6 +165,7 @@ fi
|
||||
# Extract the linker and include flags
|
||||
GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
|
||||
GEOS_CPPFLAGS=-I`$GEOSCONFIG --includes`
|
||||
+fi
|
||||
AC_SUBST([GEOS_LDFLAGS])
|
||||
AC_SUBST([GEOS_CPPFLAGS])
|
||||
# Ensure that we can parse geos_c.h
|
||||
@@ -172,11 +174,14 @@ CPPFLAGS="$GEOS_CPPFLAGS"
|
||||
AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])])
|
||||
CPPFLAGS="$CPPFLAGS_SAVE"
|
||||
# Ensure we can link against libgeos_c
|
||||
+if 0; then
|
||||
LIBS_SAVE="$LIBS"
|
||||
LIBS="$GEOS_LDFLAGS"
|
||||
AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig]))
|
||||
LIBS="$LIBS_SAVE"
|
||||
LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c'
|
||||
+fi
|
||||
+LIBS="$LIBS $GEOS_LDFLAGS"
|
||||
|
||||
PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.]))
|
||||
AC_SUBST(LIBSPATIALITE_CFLAGS)
|
||||
@ -19,7 +19,7 @@ index 53ef75197..d48fb02db 100644
|
||||
- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
|
||||
- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib \
|
||||
- /Fe$(SPATIALITE_EXE)
|
||||
+ cl shell.obj $(LIBS_ALL) /Fe$(SPATIALITE_EXE)
|
||||
+ cl shell.obj /Fe$(SPATIALITE_EXE) $(LIBS_ALL)
|
||||
if exist $(SPATIALITE_EXE).manifest mt -manifest \
|
||||
$(SPATIALITE_EXE).manifest -outputresource:$(SPATIALITE_EXE);1
|
||||
|
||||
@ -119,15 +119,12 @@ index 53ef75197..d48fb02db 100644
|
||||
if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \
|
||||
$(SPATIALITE_OSM_FILTER_EXE).manifest \
|
||||
-outputresource:$(SPATIALITE_OSM_FILTER_EXE);1
|
||||
|
||||
diff --git a/nmake.opt b/nmake.opt
|
||||
index 4f4a9538e..d9efecf7b 100644
|
||||
--- a/nmake.opt
|
||||
+++ b/nmake.opt
|
||||
@@ -1,8 +1,8 @@
|
||||
# Directory tree where SpatiaLite will be installed.
|
||||
-INSTDIR=C:\OSGeo4W
|
||||
+INSTDIR=$(INST_DIR)
|
||||
@@ -2,7 +2,7 @@
|
||||
INSTDIR=C:\OSGeo4W
|
||||
|
||||
# Uncomment the first for an optimized build, or the second for debug.
|
||||
-OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
|
||||
@ -135,55 +132,3 @@ index 4f4a9538e..d9efecf7b 100644
|
||||
/D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1
|
||||
#OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 75ac806..d680b74 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -39,7 +39,7 @@ bin_PROGRAMS = spatialite \
|
||||
spatialite_dem
|
||||
endif
|
||||
|
||||
-AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@
|
||||
+AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@ @RTTOPO_CFLAGS@
|
||||
AM_CPPFLAGS += -I$(top_srcdir)
|
||||
|
||||
spatialite_SOURCES = shell.c
|
||||
@@ -65,27 +65,27 @@ spatialite_osm_overpass_SOURCES = spatialite_osm_overpass.c
|
||||
spatialite_dem_SOURCES = spatialite_dem.c
|
||||
|
||||
spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
|
||||
+ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_osm_overpass_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
|
||||
+ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
|
||||
+ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
|
||||
+ @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@ \
|
||||
+ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ \
|
||||
-lexpat
|
||||
-spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@
|
||||
+spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
@LIBFREEXL_LIBS@ \
|
||||
- @READLINE_LIBS@
|
||||
+ @READLINE_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
spatialite_xml_validator_LDADD = @LIBXML2_LIBS@
|
||||
-spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
+spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@\
|
||||
-lexpat
|
||||
-spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@
|
||||
-spatialite_xml_print_LADD = @LIBSPATIALIATE_LIBS@
|
||||
+spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
+spatialite_xml_print_LADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
LDADD = @LIBSPATIALITE_LIBS@ \
|
||||
- @LIBFREEXL_LIBS@
|
||||
+ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
|
||||
|
||||
EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
|
||||
config-msvc.h \
|
||||
|
||||
@ -1,145 +1,94 @@
|
||||
set(SPATIALITE_TOOLS_VERSION_STR "5.0.0")
|
||||
# Allow empty include directory
|
||||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
|
||||
set(SPATIALITE_TOOLS_VERSION_STR "5.0.1")
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
|
||||
URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
|
||||
FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
|
||||
SHA512 a1497824df2c45ffa1ba6b4ec53794c2c4779b6357885ee6f1243f2bff137c3e4dd93b0a802239ced73f66be22faf0081b83bf0ad4effb8a04052712625865d1
|
||||
SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
vcpkg_extract_source_archive(SOURCE_PATH
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
PATCHES
|
||||
fix-linux-configure.patch
|
||||
fix-makefiles.patch
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/config.h")
|
||||
|
||||
set(PKGCONFIG_MODULES expat libxml-2.0 sqlite3)
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
|
||||
set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib")
|
||||
set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib")
|
||||
set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib")
|
||||
set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib")
|
||||
set(SPATIALITE_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib")
|
||||
set(SPATIALITE_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib")
|
||||
set(ICONV_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib")
|
||||
set(ICONV_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib")
|
||||
set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib")
|
||||
set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib")
|
||||
else()
|
||||
set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib")
|
||||
set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib")
|
||||
set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib")
|
||||
set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib")
|
||||
set(SPATIALITE_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib ${CURRENT_INSTALLED_DIR}/lib/freexl.lib ${CURRENT_INSTALLED_DIR}/lib/librttopo.lib")
|
||||
set(SPATIALITE_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib ${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib")
|
||||
set(ICONV_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib")
|
||||
set(ICONV_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib")
|
||||
set(EXPAT_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib")
|
||||
set(EXPAT_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib")
|
||||
endif()
|
||||
list(APPEND PKGCONFIG_MODULES readosm spatialite)
|
||||
x_vcpkg_pkgconfig_get_modules(
|
||||
PREFIX PKGCONFIG
|
||||
MODULES --msvc-syntax ${PKGCONFIG_MODULES}
|
||||
LIBS
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(UWP_LIBS windowsapp.lib)
|
||||
set(UWP_LINK_FLAGS /APPCONTAINER)
|
||||
endif()
|
||||
set(ICONV_LIBS "iconv.lib")
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
string(APPEND ICONV_LIBS " charset.lib")
|
||||
endif()
|
||||
|
||||
set(LIBS_ALL_DBG
|
||||
"${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
|
||||
${CURRENT_INSTALLED_DIR}/debug/lib/readosm.lib \
|
||||
${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \
|
||||
${LIBXML2_LIBS_DBG} \
|
||||
${GEOS_LIBS_DBG} \
|
||||
${ICONV_LIBS_DBG} \
|
||||
${SPATIALITE_LIBS_DBG} \
|
||||
${EXPAT_LIBS_DBG} \
|
||||
${UWP_LIBS} \
|
||||
${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib"
|
||||
)
|
||||
set(LIBS_ALL_REL
|
||||
"${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
|
||||
${CURRENT_INSTALLED_DIR}/lib/readosm.lib \
|
||||
${CURRENT_INSTALLED_DIR}/lib/zlib.lib \
|
||||
${LIBXML2_LIBS_REL} \
|
||||
${GEOS_LIBS_REL} \
|
||||
${ICONV_LIBS_REL} \
|
||||
${SPATIALITE_LIBS_REL} \
|
||||
${EXPAT_LIBS_REL} \
|
||||
${UWP_LIBS} \
|
||||
${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib"
|
||||
)
|
||||
set(UWP_LIBS "")
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(UWP_LIBS "windowsapp.lib /APPCONTAINER")
|
||||
endif()
|
||||
|
||||
file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR)
|
||||
list(APPEND OPTIONS_RELEASE
|
||||
"LINK_FLAGS=${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}"
|
||||
)
|
||||
list(APPEND OPTIONS_DEBUG
|
||||
"LINK_FLAGS=/debug ${UWP_LINK_FLAGS}" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}"
|
||||
)
|
||||
file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR)
|
||||
|
||||
vcpkg_install_nmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
"CL_FLAGS=/DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
|
||||
OPTIONS_RELEASE
|
||||
${OPTIONS_RELEASE}
|
||||
OPTIONS_DEBUG
|
||||
${OPTIONS_DEBUG}
|
||||
)
|
||||
vcpkg_install_nmake(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS_RELEASE
|
||||
"INSTDIR=${INST_DIR}"
|
||||
"LIBS_ALL=/link ${PKGCONFIG_LIBS_RELEASE} ${ICONV_LIBS} ${UWP_LIBS}"
|
||||
OPTIONS_DEBUG
|
||||
"INSTDIR=${INST_DIR}\\debug"
|
||||
"LIBS_ALL=/link ${PKGCONFIG_LIBS_DEBUG} ${ICONV_LIBS} ${UWP_LIBS}"
|
||||
)
|
||||
|
||||
list(APPEND TOOL_EXES
|
||||
shp_sanitize
|
||||
spatialite_osm_filter
|
||||
spatialite_osm_raw
|
||||
spatialite_gml
|
||||
spatialite_osm_map
|
||||
exif_loader
|
||||
spatialite_osm_net
|
||||
spatialite_network
|
||||
spatialite_tool
|
||||
shp_doctor
|
||||
spatialite
|
||||
)
|
||||
vcpkg_copy_tools(TOOL_NAMES ${TOOL_EXES} AUTO_CLEAN)
|
||||
set(TOOL_EXES
|
||||
shp_sanitize
|
||||
spatialite_osm_filter
|
||||
spatialite_osm_raw
|
||||
spatialite_gml
|
||||
spatialite_osm_map
|
||||
exif_loader
|
||||
spatialite_osm_net
|
||||
spatialite_network
|
||||
spatialite_tool
|
||||
shp_doctor
|
||||
spatialite
|
||||
)
|
||||
vcpkg_copy_tools(TOOL_NAMES ${TOOL_EXES} AUTO_CLEAN)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
||||
elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
|
||||
if(VCPKG_TARGET_IS_LINUX)
|
||||
set(LIBS "-lpthread -ldl -lm -lz -lstdc++")
|
||||
else()
|
||||
set(LIBS "-lpthread -ldl -lm -lz -lc++ -liconv -lc")
|
||||
endif()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
|
||||
list(APPEND OPTIONS_RELEASE
|
||||
"LIBXML2_LIBS=-lxml2 -llzma"
|
||||
"GEOS_LDFLAGS=-lgeos_c -lgeos"
|
||||
)
|
||||
list(APPEND OPTIONS_DEBUG
|
||||
"LIBXML2_LIBS=-lxml2 -llzmad"
|
||||
"GEOS_LDFLAGS=-lgeos_cd -lgeosd"
|
||||
)
|
||||
else()
|
||||
x_vcpkg_pkgconfig_get_modules(
|
||||
PREFIX PKGCONFIG
|
||||
MODULES ${PKGCONFIG_MODULES}
|
||||
LIBS
|
||||
)
|
||||
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
AUTOCONFIG
|
||||
OPTIONS
|
||||
"LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\""
|
||||
"LIBS=${LIBS}"
|
||||
"--disable-minizip"
|
||||
OPTIONS_DEBUG
|
||||
${OPTIONS_DEBUG}
|
||||
OPTIONS_RELEASE
|
||||
${OPTIONS_RELEASE}
|
||||
)
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
AUTOCONFIG
|
||||
OPTIONS
|
||||
--disable-minizip
|
||||
--disable-readline
|
||||
--enable-readosm
|
||||
OPTIONS_DEBUG
|
||||
"LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS"
|
||||
OPTIONS_RELEASE
|
||||
"LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS"
|
||||
)
|
||||
|
||||
vcpkg_install_make()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
||||
vcpkg_install_make()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
endif()
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
# Allow empty include directory
|
||||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
@ -1,14 +1,11 @@
|
||||
{
|
||||
"name": "spatialite-tools",
|
||||
"version-string": "5.0.0",
|
||||
"port-version": 4,
|
||||
"version-string": "5.0.1",
|
||||
"description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)",
|
||||
"homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index",
|
||||
"dependencies": [
|
||||
"expat",
|
||||
"geos",
|
||||
"libiconv",
|
||||
"librttopo",
|
||||
{
|
||||
"name": "libspatialite",
|
||||
"features": [
|
||||
@ -16,9 +13,12 @@
|
||||
"rttopo"
|
||||
]
|
||||
},
|
||||
"proj4",
|
||||
"libxml2",
|
||||
"readosm",
|
||||
"sqlite3",
|
||||
"zlib"
|
||||
{
|
||||
"name": "vcpkg-pkgconfig-get-modules",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1665,7 +1665,6 @@ open62541:x64-windows-static-md=fail
|
||||
openscap:x64-windows-static-md=fail
|
||||
portmidi:x64-windows-static-md=fail
|
||||
quantlib:x64-windows-static-md=fail
|
||||
readosm:x64-windows-static-md=fail
|
||||
sentencepiece:x64-windows-static-md=fail
|
||||
symengine:x64-windows-static-md=fail
|
||||
unicorn:x64-windows-static-md=fail
|
||||
|
||||
@ -5938,7 +5938,7 @@
|
||||
},
|
||||
"readosm": {
|
||||
"baseline": "1.1.0a",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"realsense2": {
|
||||
"baseline": "2.49.0",
|
||||
@ -6429,8 +6429,8 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"spatialite-tools": {
|
||||
"baseline": "5.0.0",
|
||||
"port-version": 4
|
||||
"baseline": "5.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"spdk": {
|
||||
"baseline": "19.01.1",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4a5f7efaec651bab56e95ba4db4e8d9316050b9c",
|
||||
"version-string": "1.1.0a",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "32ab4a5c33cd4854b932547e791af28e39e4586e",
|
||||
"version-string": "1.1.0a",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bd6f0ddd2db2c709ce3bd94df91dced9e3d23c7e",
|
||||
"version-string": "5.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "e31f1f43c34f7ab68bfbfcfe1a9edcd8040c3373",
|
||||
"version-string": "5.0.0",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user