From 3b28bd10d3f4db7b7a80d70e8c8f1e488441dfb3 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 20:33:15 -0700 Subject: [PATCH 1/5] externpro 25.07.3-12-g754ff59 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 65ad285..754ff59 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 65ad2858f2525afcc228039bf52acf919139806a +Subproject commit 754ff597cf9406625456b96d4f5b158aae39900e From 22043aa0654670aac9257f94b47ac2df7a420b45 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 20:34:09 -0700 Subject: [PATCH 2/5] workflows: externpro@25.07.3 --- .github/workflows/xpbuild.yml | 20 ++++++++++---------- .github/workflows/xprelease.yml | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index fb55758..8d2fdec 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,4 +1,7 @@ name: Build +permissions: + contents: read + pull-requests: write on: push: branches: [ "dev" ] @@ -7,24 +10,21 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 + permissions: + contents: read + pull-requests: write + packages: write + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3 with: cmake-workflow-preset: LinuxRelease - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-24.04-arm secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3 with: cmake-workflow-preset: DarwinRelease secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index f868a82..86b6f88 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,10 +9,9 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write From f58a9b3a5da7a1725a3d2e12c1a5695828e75bfc Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 20:42:00 -0700 Subject: [PATCH 3/5] CMakePresets: updates from externpro cmake/presets --- CMakePresetsBase.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 565061f..4489d79 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -9,5 +9,11 @@ "XP_NAMESPACE": "xpro" } } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } ] } From 40230ba5e9db28405a32fbfcb5ffbd0bf4ff76c7 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 20:45:38 -0700 Subject: [PATCH 4/5] cmake: xproinc enhancements --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 497fa8b..b2e58a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(spatialite-tools VERSION 5.1.0) set(xVer a) # letter after CMAKE_PROJECT_VERSION, for example 5.1.0a -include(xpflags) -include(GNUInstallDirs) option(BUILD_AUTOMAKE "build with automake" OFF) if(BUILD_AUTOMAKE) include(ExternalProject) From c220a2648d53b74bd0477907382615ef2453175d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 20:52:06 -0700 Subject: [PATCH 5/5] cmake: xpExternPackage() replaces xpPackageDevel() --- CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2e58a3..72c5bdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,12 +16,17 @@ if(BUILD_AUTOMAKE) else() set(targetsFile ${CMAKE_PROJECT_NAME}-targets) if(DEFINED XP_NAMESPACE) + xpExternPackage(TARGETS_FILE ${targetsFile} + BASE ${CMAKE_PROJECT_VERSION}${xVer} XPDIFF "auto" PVT_DEPS libspatialite + WEB "https://www.gaia-gis.it/fossil/spatialite-tools/index" + DESC "collection of open source Command Line Interface (CLI) tools supporting SpatiaLite" + LICENSE "[GPL-3.0](https://www.gaia-gis.it/fossil/spatialite-tools/index 'GPL-3.0-or-later')" + ) set(nameSpace NAMESPACE ${XP_NAMESPACE}::) + set(CMAKE_INSTALL_CMAKEDIR ${XP_INSTALL_CMAKEDIR}) + elseif(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) + set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) endif() - if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) - endif() - xpPackageDevel(TARGETS_FILE ${targetsFile}) xpFindPkg(PKGS libiconv libspatialite) include(cmake/configure.cmake) set(spatialite_srcs shell.c) @@ -66,5 +71,5 @@ else() target_compile_definitions(${exe} PRIVATE SQLITE_OMIT_TRACE) # TODO install(TARGETS ${exe} EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Release) endforeach() - install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace}) + install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace}) endif()