From 21ae3abd5e61198c3ad2745b012aeb91c269669b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 15:53:10 -0700 Subject: [PATCH 1/5] externpro 25.07.3-9-gaca2ba8 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index a9d469d..aca2ba8 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit a9d469d3aa8a45711c71b91630f4507f07f48358 +Subproject commit aca2ba80ab3f3009b7cdd6d33fb3bc89c24e27e2 From 0d8036d8736d9130812262ad05d693779b3c0c5e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 16:27:25 -0700 Subject: [PATCH 2/5] workflows: externpro@25.07.3 --- .github/workflows/xpbuild.yml | 13 +++---------- .github/workflows/xprelease.yml | 3 +-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index fb55758..cf566b6 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -7,24 +7,17 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 + 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 ef0a82bc27c3473ede77e1e76874b90338b01834 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 16:34:16 -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 09653d8..085cdc3 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -6,5 +6,11 @@ "hidden": true, "binaryDir": "${sourceDir}/_bld-${presetName}" } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } ] } From bddda490d46712ff28a9384642064cb12ef52c4c Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 16:39:13 -0700 Subject: [PATCH 4/5] CMakePresetsBase: add XP_NAMESPACE to cacheVariables --- CMakePresetsBase.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 085cdc3..4489d79 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -4,7 +4,10 @@ { "name": "config-base", "hidden": true, - "binaryDir": "${sourceDir}/_bld-${presetName}" + "binaryDir": "${sourceDir}/_bld-${presetName}", + "cacheVariables": { + "XP_NAMESPACE": "xpro" + } } ], "buildPresets": [ From 8729198e841423dd9822bfc5f4769714c5d2ef91 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 15 Jan 2026 16:59:13 -0700 Subject: [PATCH 5/5] cmake: xproinc enhancements and xpExternPackage() --- CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8489e1..9f174ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,10 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(libiconv VERSION 1.18) -include(GNUInstallDirs) -include(xpflags) -set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) -set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME devel) -set(libName xpro::${PROJECT_NAME}) +if(DEFINED XP_NAMESPACE) + set(nameSpace ${XP_NAMESPACE}::) +endif() +set(libName ${nameSpace}${PROJECT_NAME}) if(WIN32) install(FILES iconv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES x64/ReleaseStatic/libiconvStatic.lib DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -44,4 +43,11 @@ else() "" ) endif() -xpPackageDevel() +if(DEFINED XP_NAMESPACE) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + LIBRARIES ${PROJECT_NAME} BASE v0 XPDIFF "bin" + WEB "https://www.gnu.org/software/libiconv/" UPSTREAM "github.com/pffang/libiconv-for-Windows/releases/tag/1.18-eed6782" + DESC "character set conversion library" + LICENSE "[LGPL-2.1](https://savannah.gnu.org/projects/libiconv/ 'LGPL version 2.1')" + ) +endif()