From a17085dd2b90823927c377e0fa42a8b712907635 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 16 Sep 2025 14:57:56 -0600 Subject: [PATCH 1/7] externpro 25.05.1-59-g5b0195c --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index b2b8610..5b0195c 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit b2b86105482f508103a8c91c357e48bc79f598ae +Subproject commit 5b0195cd59b2e48663c8e62889093ced3474759f From 02927330cac5048d270295b186de5e9d5ce074f8 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 16 Sep 2025 15:11:21 -0600 Subject: [PATCH 2/7] externpro github/workflows @25.05.1 cp .devcontainer/.github/wf-templates/*.yml .github/workflows --- .github/workflows/{build.yml => xpbuild.yml} | 11 ++++++++--- .github/workflows/{release.yml => xprelease.yml} | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) rename .github/workflows/{build.yml => xpbuild.yml} (77%) rename .github/workflows/{release.yml => xprelease.yml} (83%) diff --git a/.github/workflows/build.yml b/.github/workflows/xpbuild.yml similarity index 77% rename from .github/workflows/build.yml rename to .github/workflows/xpbuild.yml index 33dce81..151d481 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/xpbuild.yml @@ -7,19 +7,24 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: Linux runon: ubuntu-latest secrets: inherit linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: Linux runon: ubuntu-24.04-arm secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + with: + cmake-workflow-preset: Darwin + secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 with: cmake-workflow-preset: Windows secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/xprelease.yml similarity index 83% rename from .github/workflows/release.yml rename to .github/workflows/xprelease.yml index 6fa033b..f868a82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/xprelease.yml @@ -9,8 +9,12 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.tar.xz" + permissions: + contents: write + id-token: write + attestations: write secrets: inherit From 5f1f74a40cdbc89621ee94ddb681d0bbacff7e94 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 16 Sep 2025 15:13:03 -0600 Subject: [PATCH 3/7] CMakePresets: include xpDarwinNinja (for macOS) cp .devcontainer/cmake/presets/CMakePresets.json . --- CMakePresets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakePresets.json b/CMakePresets.json index 5a06690..f82cfdd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,6 +2,7 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpDarwinNinja.json", ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From c928e818e44f649f57e172e537e3fbc138515dd1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 17 Sep 2025 10:30:21 -0600 Subject: [PATCH 4/7] cmake: use externpro's xpcfgDotinFile * cmake option BUILD_AUTOMAKE that installs auto[conf|make] tools * cmake/config.h.cmake.in and cmake/gaiaconfig.h.cmake.in are obsolete --- CMakeLists.txt | 15 ++++++++------- cmake/configure.cmake | 13 ++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72fa612..8cb1477 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,13 +4,8 @@ include(preproject) project(libspatialite VERSION 5.1.0.4) include(flags) include(GNUInstallDirs) -if(TRUE) - xpFindPkg(PKGS geos libiconv sqlite3 zlib) - include(configure) - add_subdirectory(src) - add_subdirectory(examples) - add_subdirectory(spatialite) -else() +option(BUILD_AUTOMAKE "build with automake" OFF) +if(BUILD_AUTOMAKE) include(ExternalProject) set_property(DIRECTORY PROPERTY "EP_BASE" ${CMAKE_BINARY_DIR}/epbase) ExternalProject_Add(${PROJECT_NAME} @@ -19,4 +14,10 @@ else() CONFIGURE_COMMAND /configure --prefix= --disable-shared --disable-proj --disable-freexl --disable-geos3100 --disable-libxml2 --disable-minizip --disable-rttopo --disable-gcp ) +else() + xpFindPkg(PKGS geos libiconv sqlite3 zlib) + include(cmake/configure.cmake) + add_subdirectory(src) + add_subdirectory(examples) + add_subdirectory(spatialite) endif() diff --git a/cmake/configure.cmake b/cmake/configure.cmake index b1247a5..cb99546 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -61,7 +61,6 @@ xpcfgLstatFollowsSlashedSymlink(LSTAT_FOLLOWS_SLASHED_SYMLINK) xpcfgStdcHeaders(STDC_HEADERS) xpcfgTimeWithSysTime(TIME_WITH_SYS_TIME) xpcfgTmInHdr(sys/time.h TM_IN_SYS_TIME) -# cmakedefine entries in config.h.cmake.in xpcfgLtObjdir(LT_OBJDIR) set(NDEBUG 1) # Must be defined in order to disable debug mode. set(PACKAGE_BUGREPORT a.furieri@lqt.it) @@ -84,9 +83,11 @@ cmake_pop_check_state() if(WIN32) set(msvc -msvc) endif() -set(CONFIG_H_COMMENT "{CMAKE_BINARY_DIR}/cmake/config${msvc}.h. Generated from cmake/config.h.cmake.in by cmake/configure.cmake.") -configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.cmake.in ${CMAKE_BINARY_DIR}/CMakeFiles/config.h.cmake) -configure_file(${CMAKE_BINARY_DIR}/CMakeFiles/config.h.cmake ${CMAKE_BINARY_DIR}/cmake/config${msvc}.h) +xpcfgDotinFile("config.h.in" "cmake/config${msvc}.h") +file(READ "${CMAKE_BINARY_DIR}/cmake/config${msvc}.h" configContent) +string(REPLACE "./src/headers/spatialite/gaiaconfig.h" "spatialite/gaiaconfig${msvc}.h" configContent "${configContent}") +file(WRITE "${CMAKE_BINARY_DIR}/cmake/config${msvc}.h" "${configContent}") +######################################## set(ENABLE_GCP FALSE) # --enable-gcp : enables Control Points (from Grass GIS) set(ENABLE_GEOPACKAGE TRUE) # --enable-geopackage : enables GeoPackage support set(ENABLE_LIBXML2 FALSE) # --enable-libxml2 : enables libxml2 inclusion # TODO find package @@ -121,6 +122,4 @@ xpcfgSetDefineList(ENABLE_GCP ENABLE_GEOPACKAGE ENABLE_LIBXML2 ENABLE_MINIZIP EN ) xpcfgTargetCpu(SPATIALITE_TARGET_CPU) set(SPATIALITE_VERSION ${CMAKE_PROJECT_VERSION}) -set(GAIACONFIG_H_COMMENT "{CMAKE_BINARY_DIR}/cmake/gaiaconfig${msvc}.h. Generated from cmake/gaiaconfig.h.cmake.in by cmake/configure.cmake.") -configure_file(${CMAKE_CURRENT_LIST_DIR}/gaiaconfig.h.cmake.in ${CMAKE_BINARY_DIR}/CMakeFiles/gaiaconfig.h.cmake) -configure_file(${CMAKE_BINARY_DIR}/CMakeFiles/gaiaconfig.h.cmake ${CMAKE_BINARY_DIR}/cmake/spatialite/gaiaconfig${msvc}.h) +xpcfgDotinFile("src/headers/spatialite/gaiaconfig.h.in" "cmake/spatialite/gaiaconfig${msvc}.h") From fb9c918d366273c3cef90e6e54804c9e64705e39 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 17 Sep 2025 10:33:26 -0600 Subject: [PATCH 5/7] cmake toplevel updates * externpro as dependency provider (xproinc) * project VERSION matches official version * no longer using 4th digit for externpro-specific version * externpro devel package gets version from 'git describe --tags' * externpro flags.cmake renamed to xpflags.cmake --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cb1477..a53c633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.31) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake ${CMAKE_CURRENT_LIST_DIR}/cmake) -include(preproject) -project(libspatialite VERSION 5.1.0.4) -include(flags) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +project(libspatialite VERSION 5.1.0) +include(xpflags) include(GNUInstallDirs) option(BUILD_AUTOMAKE "build with automake" OFF) if(BUILD_AUTOMAKE) From 5be41df607a7f93a405026da7fbfae1462d93d1c Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 17 Sep 2025 10:36:00 -0600 Subject: [PATCH 6/7] cmake/configure.cmake: updates to use latest from externpro's xpcfg.cmake --- cmake/configure.cmake | 60 ++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/cmake/configure.cmake b/cmake/configure.cmake index cb99546..517822d 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -63,20 +63,24 @@ xpcfgTimeWithSysTime(TIME_WITH_SYS_TIME) xpcfgTmInHdr(sys/time.h TM_IN_SYS_TIME) xpcfgLtObjdir(LT_OBJDIR) set(NDEBUG 1) # Must be defined in order to disable debug mode. -set(PACKAGE_BUGREPORT a.furieri@lqt.it) -set(PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_VERSION}") -set(PACKAGE_TARNAME ${CMAKE_PROJECT_NAME}) -set(PACKAGE_URL https://www.gaia-gis.it/fossil/libspatialite/home) -set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) +set(PACKAGE_BUGREPORT "\"a.furieri@lqt.it\"") +set(PACKAGE_NAME "\"${CMAKE_PROJECT_NAME}\"") +set(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_VERSION}\"") +set(PACKAGE_TARNAME "\"${CMAKE_PROJECT_NAME}\"") +set(PACKAGE_URL "\"https://www.gaia-gis.it/fossil/libspatialite/home\"") +set(PACKAGE_VERSION "\"${CMAKE_PROJECT_VERSION}\"") xpcfgHugeFileSupport() -xpcfgConst() +xpcfgConst(const) xpcfgCheckTypeSize() if(NOT HAVE_SIZEOF_OFF_T) set(off_t "long int") # Define to `long int' if does not define. */ +else() + set(off_t 0) # cmakedefine endif() if(NOT HAVE_SIZEOF_SIZE_T) set(size_t "unsigned int") # Define to `unsigned int' if does not define. +else() + set(size_t 0) # cmakedefine endif() xpcfgVolatile(volatile) cmake_pop_check_state() @@ -91,22 +95,35 @@ file(WRITE "${CMAKE_BINARY_DIR}/cmake/config${msvc}.h" "${configContent}") set(ENABLE_GCP FALSE) # --enable-gcp : enables Control Points (from Grass GIS) set(ENABLE_GEOPACKAGE TRUE) # --enable-geopackage : enables GeoPackage support set(ENABLE_LIBXML2 FALSE) # --enable-libxml2 : enables libxml2 inclusion # TODO find package -set(ENABLE_MINIZIP FALSE) # --enable-minizip : enables MiniZIP inclusion # TODO find package -set(ENABLE_RTTOPO ${HAVE_LIBRTTOPO_H}) # --enable-rttopo : enables RTTOPO support -set(GEOS_370 ${HAVE_GEOS_C_H}) # --enable-geos370 : enables GEOS 3.7.0 features -set(GEOS_3100 ${HAVE_GEOS_C_H}) # --enable-geos3100 : enables GEOS 3.10.0 features -set(GEOS_3110 ${HAVE_GEOS_C_H}) # --enable-geos3110 # enables GEOS 3.11.0 features -set(GEOS_ADVANCED ${HAVE_GEOS_C_H}) # enable geosadvanced, libgeos_c >= v.3.4.0 -set(GEOS_ONLY_REENTRANT FALSE) # --with-geosonlyreentrant -set(GEOS_REENTRANT ${HAVE_GEOS_C_H}) # --enable-geosreentrant : enables GEOS reentrant (fully thread safe) -set(OMIT_EPSG FALSE) # --enable-epsg : enables full EPSG dataset support -set(OMIT_FREEXL TRUE) # --enable-freexml : enables FreeXL inclusion -set(OMIT_GEOCALLBACKS FALSE) # TODO search +if(HAVE_MINIZIP_UNZIP_H) + set(ENABLE_MINIZIP TRUE) # --enable-minizip : enables MiniZIP inclusion +else() + set(ENABLE_MINIZIP FALSE) +endif() +if(HAVE_LIBRTTOPO_H) + set(ENABLE_RTTOPO TRUE) # --enable-rttopo : enables RTTOPO support +else() + set(ENABLE_RTTOPO FALSE) +endif() if(HAVE_GEOS_C_H) + set(GEOS_370 TRUE) # --enable-geos370 : enables GEOS 3.7.0 features + set(GEOS_3100 TRUE) # --enable-geos3100 : enables GEOS 3.10.0 features + set(GEOS_3110 TRUE) # --enable-geos3110 # enables GEOS 3.11.0 features + set(GEOS_ADVANCED TRUE) # enable geosadvanced, libgeos_c >= v.3.4.0 + set(GEOS_REENTRANT TRUE) # --enable-geosreentrant : enables GEOS reentrant (fully thread safe) set(OMIT_GEOS FALSE) # --enable-geos : enables GEOS inclusion else() + set(GEOS_370 FALSE) + set(GEOS_3100 FALSE) + set(GEOS_3110 FALSE) + set(GEOS_ADVANCED FALSE) + set(GEOS_REENTRANT FALSE) set(OMIT_GEOS TRUE) endif() +set(GEOS_ONLY_REENTRANT FALSE) # --with-geosonlyreentrant +set(OMIT_EPSG FALSE) # --enable-epsg : enables full EPSG dataset support +set(OMIT_FREEXL TRUE) # --enable-freexml : enables FreeXL inclusion +set(OMIT_GEOCALLBACKS FALSE) # TODO search if(HAVE_ICONV_H) set(OMIT_ICONV FALSE) # --enable-iconv : enables ICONV inclusion else() @@ -116,10 +133,7 @@ set(OMIT_KNN FALSE) # TODO search set(OMIT_MATHSQL FALSE) # --enable-mathsql : enables SQL math functions set(OMIT_PROJ TRUE) # --enable-proj : enables PROJ.4 inclusion set(PROJ_NEW FALSE) # associated with --enable-proj -xpcfgSetDefineList(ENABLE_GCP ENABLE_GEOPACKAGE ENABLE_LIBXML2 ENABLE_MINIZIP ENABLE_RTTOPO - GEOS_370 GEOS_3100 GEOS_3110 GEOS_ADVANCED GEOS_ONLY_REENTRANT GEOS_REENTRANT - OMIT_EPSG OMIT_FREEXL OMIT_GEOCALLBACKS OMIT_GEOS OMIT_ICONV OMIT_KNN OMIT_MATHSQL OMIT_PROJ PROJ_NEW - ) xpcfgTargetCpu(SPATIALITE_TARGET_CPU) -set(SPATIALITE_VERSION ${CMAKE_PROJECT_VERSION}) +set(SPATIALITE_TARGET_CPU "\"${SPATIALITE_TARGET_CPU}\"") +set(SPATIALITE_VERSION "\"${CMAKE_PROJECT_VERSION}\"") xpcfgDotinFile("src/headers/spatialite/gaiaconfig.h.in" "cmake/spatialite/gaiaconfig${msvc}.h") From 39693fb85287df7421a7075c04c2ebc8ff8b3c0c Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 17 Sep 2025 10:43:39 -0600 Subject: [PATCH 7/7] cmake: [gaia]config.h.cmake.in files obsolete * externpro's xpcfgDotinFile() cmake function uses same files configure does * config.h.in from root of repo (in place of config.h.cmake.in) * src/headers/spatialite/gaiaconfig.h.in (in place of gaiaconfig.h.cmake.in * fewer files to maintain (and manually update) --- cmake/config.h.cmake.in | 200 ------------------------------------ cmake/gaiaconfig.h.cmake.in | 69 ------------- 2 files changed, 269 deletions(-) delete mode 100644 cmake/config.h.cmake.in delete mode 100644 cmake/gaiaconfig.h.cmake.in diff --git a/cmake/config.h.cmake.in b/cmake/config.h.cmake.in deleted file mode 100644 index adc86bf..0000000 --- a/cmake/config.h.cmake.in +++ /dev/null @@ -1,200 +0,0 @@ -/* @CONFIG_H_COMMENT@ */ -/* ./cmake/config.h.cmake.in - copied, modified from config.h.in, manually maintained */ -/* ./config.h.in - manually maintained */ - -/* depending on SQLite library version. */ -#@DEFINE_HAVE_DECL_SQLITE_INDEX_CONSTRAINT_LIKE@ HAVE_DECL_SQLITE_INDEX_CONSTRAINT_LIKE - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_DLFCN_H@ HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_FCNTL_H@ HAVE_FCNTL_H - -/* Define to 1 if you have the `fdatasync' function. */ -#@DEFINE_HAVE_FDATASYNC@ HAVE_FDATASYNC - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_FLOAT_H@ HAVE_FLOAT_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_FREEXL_H@ HAVE_FREEXL_H - -/* Define to 1 if you have the `ftruncate' function. */ -#@DEFINE_HAVE_FTRUNCATE@ HAVE_FTRUNCATE - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_GEOS_C_H@ HAVE_GEOS_C_H - -/* Define to 1 if you have the `getcwd' function. */ -#@DEFINE_HAVE_GETCWD@ HAVE_GETCWD - -/* Define to 1 if you have the `gettimeofday' function. */ -#@DEFINE_HAVE_GETTIMEOFDAY@ HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_ICONV_H@ HAVE_ICONV_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_INTTYPES_H@ HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_LIBRTTOPO_H@ HAVE_LIBRTTOPO_H - -/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */ -#@DEFINE_HAVE_LIBSQLITE3@ HAVE_LIBSQLITE3 - -/* Define to 1 if you have the `z' library (-lz). */ -#@DEFINE_HAVE_LIBZ@ HAVE_LIBZ - -/* Define to 1 if you have the `localtime_r' function. */ -#@DEFINE_HAVE_LOCALTIME_R@ HAVE_LOCALTIME_R - -/* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ -#@DEFINE_HAVE_LSTAT_EMPTY_STRING_BUG@ HAVE_LSTAT_EMPTY_STRING_BUG - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_MATH_H@ HAVE_MATH_H - -/* Define to 1 if you have the `memmove' function. */ -#@DEFINE_HAVE_MEMMOVE@ HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_MEMORY_H@ HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#@DEFINE_HAVE_MEMSET@ HAVE_MEMSET - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_MINIZIP_UNZIP_H@ HAVE_MINIZIP_UNZIP_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_PROJ_API_H@ HAVE_PROJ_API_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_PROJ_H@ HAVE_PROJ_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_SQLITE3EXT_H@ HAVE_SQLITE3EXT_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_SQLITE3_H@ HAVE_SQLITE3_H - -/* Define to 1 if you have the `sqrt' function. */ -#@DEFINE_HAVE_SQRT@ HAVE_SQRT - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#@DEFINE_HAVE_STAT_EMPTY_STRING_BUG@ HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STDDEF_H@ HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STDINT_H@ HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STDIO_H@ HAVE_STDIO_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STDLIB_H@ HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#@DEFINE_HAVE_STRCASECMP@ HAVE_STRCASECMP - -/* Define to 1 if you have the `strerror' function. */ -#@DEFINE_HAVE_STRERROR@ HAVE_STRERROR - -/* Define to 1 if you have the `strftime' function. */ -#@DEFINE_HAVE_STRFTIME@ HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STRINGS_H@ HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_STRING_H@ HAVE_STRING_H - -/* Define to 1 if you have the `strncasecmp' function. */ -#@DEFINE_HAVE_STRNCASECMP@ HAVE_STRNCASECMP - -/* Define to 1 if you have the `strstr' function. */ -#@DEFINE_HAVE_STRSTR@ HAVE_STRSTR - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_SYS_STAT_H@ HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_SYS_TIME_H@ HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_SYS_TYPES_H@ HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_UNISTD_H@ HAVE_UNISTD_H - -/* Define to 1 if you have the header file. */ -#@DEFINE_HAVE_ZLIB_H@ HAVE_ZLIB_H - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#@DEFINE_LSTAT_FOLLOWS_SLASHED_SYMLINK@ LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#cmakedefine LT_OBJDIR "@LT_OBJDIR@" - -/* Must be defined in order to disable debug mode. */ -#cmakedefine NDEBUG @NDEBUG@ - -/* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" - -/* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@" - -/* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@" - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@" - -/* Define to the home page for this package. */ -#cmakedefine PACKAGE_URL "@PACKAGE_URL@" - -/* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@" - -/* Define to 1 if you have the ANSI C header files. */ -#@DEFINE_STDC_HEADERS@ STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#@DEFINE_TIME_WITH_SYS_TIME@ TIME_WITH_SYS_TIME - -/* Define to 1 if your declares `struct tm'. */ -#@DEFINE_TM_IN_SYS_TIME@ TM_IN_SYS_TIME - -/* Must be =64 in order to enable huge-file support. */ -#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ - -/* Must be defined in order to enable huge-file support. */ -#cmakedefine _LARGEFILE_SOURCE @_LARGEFILE_SOURCE@ - -/* Must be defined in order to enable huge-file support. */ -#cmakedefine _LARGE_FILE @_LARGE_FILE@ - -/* Define to empty if `const' does not conform to ANSI C. */ -#cmakedefine const @const@ - -/* Define to `long int' if does not define. */ -#cmakedefine off_t @off_t@ - -/* Define to `unsigned int' if does not define. */ -#cmakedefine size_t @size_t@ - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#cmakedefine volatile @volatile@ - -/* includes gaiaconfig@msvc@.h */ -#include "spatialite/gaiaconfig@msvc@.h" diff --git a/cmake/gaiaconfig.h.cmake.in b/cmake/gaiaconfig.h.cmake.in deleted file mode 100644 index 3c7d3b3..0000000 --- a/cmake/gaiaconfig.h.cmake.in +++ /dev/null @@ -1,69 +0,0 @@ -/* @GAIACONFIG_H_COMMENT@ */ -/* ./cmake/gaiaconfig.h.cmake.in - copied, modified from gaiaconfig.h.in, manually maintained */ -/* ./src/headers/spatialite/gaiaconfig.h.in - manually maintained */ - -/* Should be defined in order to enable GCP support. */ -#@DEFINE_ENABLE_GCP@ ENABLE_GCP - -/* Should be defined in order to enable GeoPackage support. */ -#@DEFINE_ENABLE_GEOPACKAGE@ ENABLE_GEOPACKAGE - -/* Should be defined in order to enable LIBXML2 support. */ -#@DEFINE_ENABLE_LIBXML2@ ENABLE_LIBXML2 - -/* Should be defined in order to enable MiniZIP support. */ -#@DEFINE_ENABLE_MINIZIP@ ENABLE_MINIZIP - -/* Should be defined in order to enable RTTOPO support. */ -#@DEFINE_ENABLE_RTTOPO@ ENABLE_RTTOPO - -/* Should be defined in order to enable GEOS_370 support. */ -#@DEFINE_GEOS_370@ GEOS_370 - -/* Should be defined in order to enable GEOS_3100 support. */ -#@DEFINE_GEOS_3100@ GEOS_3100 - -/* Should be defined in order to enable GEOS_3110 support. */ -#@DEFINE_GEOS_3110@ GEOS_3110 - -/* Should be defined in order to enable GEOS_ADVANCED support. */ -#@DEFINE_GEOS_ADVANCED@ GEOS_ADVANCED - -/* Should be defined in order to fully disable GEOS non-thread-safe API. */ -#@DEFINE_GEOS_ONLY_REENTRANT@ GEOS_ONLY_REENTRANT - -/* Should be defined in order to enable GEOS_REENTRANT (fully thread-safe). */ -#@DEFINE_GEOS_REENTRANT@ GEOS_REENTRANT - -/* Should be defined in order to disable EPSG full support. */ -#@DEFINE_OMIT_EPSG@ OMIT_EPSG - -/* Should be defined in order to disable FREEXL support. */ -#@DEFINE_OMIT_FREEXL@ OMIT_FREEXL - -/* Should be defined in order to disable GEOCALLBACKS support. */ -#@DEFINE_OMIT_GEOCALLBACKS@ OMIT_GEOCALLBACKS - -/* Should be defined in order to disable GEOS support. */ -#@DEFINE_OMIT_GEOS@ OMIT_GEOS - -/* Should be defined in order to disable ICONV support. */ -#@DEFINE_OMIT_ICONV@ OMIT_ICONV - -/* Should be defined in order to disable KNN support. */ -#@DEFINE_OMIT_KNN@ OMIT_KNN - -/* Should be defined in order to disable MATHSQL support. */ -#@DEFINE_OMIT_MATHSQL@ OMIT_MATHSQL - -/* Should be defined in order to disable PROJ.4 support. */ -#@DEFINE_OMIT_PROJ@ OMIT_PROJ - -/* Should be defined in order to enable PROJ.6 support. */ -#@DEFINE_PROJ_NEW@ PROJ_NEW - -/* Should contain a text-string describing the intended target CPU */ -#cmakedefine SPATIALITE_TARGET_CPU "@SPATIALITE_TARGET_CPU@" - -/* the Version of this package */ -#cmakedefine SPATIALITE_VERSION "@SPATIALITE_VERSION@"