From 351d46706c0a15888c311f09526ccc0990114616 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 22 Jan 2026 11:41:36 -0700 Subject: [PATCH 1/4] externpro 25.07.3-39-g6acb576 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 380bfcd..6acb576 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 380bfcdd1f7655c7e27a9835f71de92e99c281fe +Subproject commit 6acb5767043db56da05239d1b5d516e1624937b7 From 9faeca4da2ad481e982d803e9d167338e04d4546 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 22 Jan 2026 11:49:56 -0700 Subject: [PATCH 2/4] 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 33ec5df..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.06 + 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.06 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-24.04-arm secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.06 + 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.06 + 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 1461914..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.06 + 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 98f2c3880a966101145bfedb478bd1f9a4ef113d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 22 Jan 2026 11:52:13 -0700 Subject: [PATCH 3/4] cmake: xproinc enhancements --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 458e269..9b50fa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(rapidxml) -include(GNUInstallDirs) -include(xpflags) set(lib_name ${PROJECT_NAME}) ######################################## set(root_srcs From 2c2d3e285b79d48724c2c0f899725ce8258e4e5a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 22 Jan 2026 11:55:07 -0700 Subject: [PATCH 4/4] cmake: xpExternPackage() replaces xpPackageDevel() --- CMakeLists.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b50fa7..076730c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,16 +17,20 @@ list(APPEND ${lib_name}_libsrcs ${root_srcs}) add_library(${lib_name} INTERFACE ${${lib_name}_libsrcs}) target_include_directories(${lib_name} INTERFACE $) ######################################## -set(lib ${lib_name}) +set(targetsFile ${PROJECT_NAME}-targets) if(DEFINED XP_NAMESPACE) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} LIBRARIES ${lib_name} + BASE v1.13 XPDIFF "intro" + WEB "http://rapidxml.sourceforge.net/" + DESC "fast XML parser" + LICENSE "[BSL-1.0 or MIT](http://rapidxml.sourceforge.net/license.txt 'Boost Software License or MIT License')" + ) set(nameSpace NAMESPACE ${XP_NAMESPACE}::) - string(PREPEND lib "${XP_NAMESPACE}::") -endif() -if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) + set(CMAKE_INSTALL_CMAKEDIR ${XP_INSTALL_CMAKEDIR}) +elseif(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) + set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) endif() -set(targetsFile ${PROJECT_NAME}-targets) -xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib}) install(TARGETS ${lib_name} EXPORT ${targetsFile}) install(FILES ${root_srcs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) -install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace}) +install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace})