diff options
| -rw-r--r-- | ports/spatialite-tools/CONTROL | 5 | ||||
| -rw-r--r-- | ports/spatialite-tools/fix-linux-configure.patch | 35 | ||||
| -rw-r--r-- | ports/spatialite-tools/fix-makefiles.patch | 39 | ||||
| -rw-r--r-- | ports/spatialite-tools/portfile.cmake | 218 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
5 files changed, 183 insertions, 116 deletions
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index f2c8384a8..a698cc8b9 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,5 @@ Source: spatialite-tools -Version: 4.3.0 -Port-Version: 7 +Version: 5.0.0 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) -Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat +Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo
\ No newline at end of file diff --git a/ports/spatialite-tools/fix-linux-configure.patch b/ports/spatialite-tools/fix-linux-configure.patch new file mode 100644 index 000000000..b31544b77 --- /dev/null +++ b/ports/spatialite-tools/fix-linux-configure.patch @@ -0,0 +1,35 @@ +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) diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch index ff6e0ad0d..a5a579686 100644 --- a/ports/spatialite-tools/fix-makefiles.patch +++ b/ports/spatialite-tools/fix-makefiles.patch @@ -1,18 +1,18 @@ diff --git a/makefile.vc b/makefile.vc -index 33c85d2..c811e7d 100644 +index 53ef75197..d48fb02db 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -15,7 +15,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe +@@ -16,7 +16,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe SPATIALITE_GML_EXE = spatialite_gml.exe -CFLAGS = /nologo -IC:\OSGeo4W\include $(OPTFLAGS) -+CFLAGS = /nologo -I$(INSTALLED_ROOT)\include $(OPTFLAGS) ++CFLAGS = /nologo $(OPTFLAGS) default: all -@@ -26,89 +26,58 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ - $(SPATIALITE_OSM_FILTER_EXE) +@@ -27,96 +27,63 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ + $(SPATIALITE_OSM_FILTER_EXE) $(SHP_SANITIZE_EXE) $(SPATIALITE_EXE): shell.obj - cl shell.obj C:\OSGeo4W\lib\proj_i.lib \ @@ -27,7 +27,7 @@ index 33c85d2..c811e7d 100644 - cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl exif_loader.obj $(LIBS_ALL) ++ cl exif_loader.obj $(LIBS_ALL) if exist $(EXIF_LOADER_EXE).manifest mt -manifest \ $(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1 @@ -35,15 +35,23 @@ index 33c85d2..c811e7d 100644 - cl shp_doctor.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl shp_doctor.obj $(LIBS_ALL) ++ cl shp_doctor.obj $(LIBS_ALL) if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \ $(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1 + $(SHP_SANITIZE_EXE): shp_sanitize.obj +- cl shp_sanitize.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl shp_sanitize.obj $(LIBS_ALL) + if exist $(SHP_SANITIZE_EXE).manifest mt -manifest \ + $(SHP_SANITIZE_EXE).manifest -outputresource:$(SHP_SANITIZE_EXE);1 + $(SPATIALITE_NETWORK_EXE): spatialite_network.obj - cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_network.obj $(LIBS_ALL) ++ cl spatialite_network.obj $(LIBS_ALL) if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -52,7 +60,7 @@ index 33c85d2..c811e7d 100644 - cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_tool.obj $(LIBS_ALL) ++ cl spatialite_tool.obj $(LIBS_ALL) if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \ $(SPATIALITE_TOOL_EXE).manifest \ -outputresource:$(SPATIALITE_TOOL_EXE);1 @@ -64,7 +72,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_net.obj $(LIBS_ALL) ++ cl spatialite_osm_net.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_NET_EXE);1 @@ -76,7 +84,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_map.obj $(LIBS_ALL) ++ cl spatialite_osm_map.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_MAP_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_MAP_EXE);1 @@ -86,7 +94,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_gml.obj $(LIBS_ALL) ++ cl spatialite_gml.obj $(LIBS_ALL) if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \ $(SPATIALITE_GML_EXE).manifest \ -outputresource:$(SPATIALITE_GML_EXE);1 @@ -98,7 +106,7 @@ index 33c85d2..c811e7d 100644 - C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\zlib.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_raw.obj $(LIBS_ALL) ++ cl spatialite_osm_raw.obj $(LIBS_ALL) if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_RAW_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_RAW_EXE);1 @@ -107,12 +115,13 @@ index 33c85d2..c811e7d 100644 - cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \ - C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib -+ cl spatialite_osm_filter.obj $(LIBS_ALL) ++ cl spatialite_osm_filter.obj $(LIBS_ALL) 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 4f4a953..d9efecf 100644 +index 4f4a9538e..d9efecf7b 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,8 +1,8 @@ diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index a9ef6ec3d..4b53010a3 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -1,120 +1,146 @@ -option(BUILD_DEBUG_TOOLS "Build debug version of tools" OFF) - +set(SPATIALITE_TOOLS_VERSION_STR "5.0.0") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.3.0.tar.gz" - FILENAME "spatialite-tools-4.3.0.tar.gz" - SHA512 e1de27c1c65ff2ff0b08583113517bea74edf33fff59ad6e9c77492ea3ae87d9c0f17d7670ee6602b32eea73ad3678bb5410ef2c6fac6e213bf2e341a907db88 + URLS "http://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 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES + fix-linux-configure.patch fix-makefiles.patch ) -find_program(NMAKE nmake) - -set(LDIR "\"${CURRENT_INSTALLED_DIR}\"") +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() -if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib") - set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib") - set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib") - set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib") - set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib") - set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib") - set(EXPAT_LIBS_REL "${LDIR}/lib/libexpat.lib") - set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatd.lib") -else() - set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") - set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib ${LDIR}/lib/geos.lib") - set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib ${LDIR}/debug/lib/geosd.lib") - set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib ${LDIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzmad.lib ws2_32.lib") - set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib ${LDIR}/lib/librttopo.lib") - set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib ${LDIR}/debug/lib/librttopo.lib") - set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib ${LDIR}/lib/charset.lib") - set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib ${LDIR}/debug/lib/charset.lib ") - set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib") - set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatdMD.lib") -endif() + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS windowsapp.lib) + set(UWP_LINK_FLAGS /APPCONTAINER) + endif() -set(LIBS_ALL_DBG - "${ICONV_LIBS_DBG} \ - ${LDIR}/debug/lib/sqlite3.lib \ - ${SPATIALITE_LIBS_DBG} \ - ${LIBXML2_LIBS_DBG} \ - ${GEOS_LIBS_DBG} \ - ${EXPAT_LIBS_DBG} \ - ${LDIR}/debug/lib/readosm.lib \ - ${LDIR}/debug/lib/zlibd.lib \ - ${LDIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" - ) -set(LIBS_ALL_REL - "${ICONV_LIBS_REL} \ - ${LDIR}/lib/sqlite3.lib \ - ${SPATIALITE_LIBS_REL} \ - ${LIBXML2_LIBS_REL} \ - ${GEOS_LIBS_REL} \ - ${EXPAT_LIBS_REL} \ - ${LDIR}/lib/readosm.lib \ - ${LDIR}/lib/zlib.lib \ - ${LDIR}/lib/proj.lib ole32.lib shell32.lib" - ) + 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" + ) -if(BUILD_DEBUG_TOOLS) - ################ - # Debug build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-dgb") + 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_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/) -else() - ################ - # Release build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-rel") + 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} + ) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) - vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc clean install - "INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-release - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") - set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/) -endif() + 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) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + 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(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) -file(GLOB EXES "${EXE_FOLDER}/*.exe") -file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE ${EXES}) + 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" + ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" + "LIBS=${LIBS}" + "--disable-minizip" + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ) -if(NOT BUILD_DEBUG_TOOLS AND VCPKG_CRT_LINKAGE STREQUAL dynamic) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) endif() -message(STATUS "Packaging ${TARGET_TRIPLET} done") +# 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) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 088f09ca2..24c51949d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1422,8 +1422,6 @@ soundtouch:x64-windows-static=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail -spatialite-tools:x64-linux=fail -spatialite-tools:x64-osx=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail |