diff --git a/.devcontainer b/.devcontainer index fcac5368b719..41ad6077abe2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit fcac5368b71982834ceecde7d17721a54b48e1a5 +Subproject commit 41ad6077abe2e46fdbf1156f7c738b6ab3aed610 diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 969f48d456e7..8b6bc0948fcc 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,11 +14,11 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.06.5 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.06.6 secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.06.5 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.06.6 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.06.5 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.06.6 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index a440dfc47fdb..473da07e8d0e 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,7 +9,7 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.06.5 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.06.6 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/CMakeLists.txt b/CMakeLists.txt index 741ac7b36ca3..6e989e397a3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,7 +389,7 @@ if (FMT_INSTALL) if(DEFINED XP_NAMESPACE) set(FMT_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake) set(FMT_NAMESPACE ${XP_NAMESPACE}) - xpExternPackage(REPO_NAME fmt NAMESPACE ${XP_NAMESPACE} + xpExternPackage(REPO_NAME fmt NAMESPACE ${XP_NAMESPACE} ALIAS_NAMESPACE fmt TARGETS_FILE fmt-targets LIBRARIES fmt fmt-header-only ) else()