diff --git a/.devcontainer b/.devcontainer index cf054a4d69ed..1ebba86da156 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit cf054a4d69edb1a88f5d4ee9354d1a57798a7081 +Subproject commit 1ebba86da156da38487318be095a089054f28f03 diff --git a/.github/release-tag.json b/.github/release-tag.json index 5e7626a0c7b8..f593e791bc0d 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 12.1.0.5 tag", - "tag": "xpv12.1.0.5" + "message": "xpro version 12.1.0.6 tag", + "tag": "xpv12.1.0.6" } diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index b3a6f37b70c4..6b21537fd9fb 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,15 +14,15 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.18 + uses: externpro/externpro/.github/workflows/build-linux.yml@26.01 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} with: {} macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.18 + uses: externpro/externpro/.github/workflows/build-macos.yml@26.01 secrets: inherit with: {} windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.18 + uses: externpro/externpro/.github/workflows/build-windows.yml@26.01 secrets: inherit with: {} diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index 86726711f334..ec3fedbb203c 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -34,7 +34,7 @@ jobs: # Upload build artifacts as release assets release-from-build: if: github.event_name == 'workflow_dispatch' - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.18 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index d843502ec37c..cd59ea313b16 100644 --- a/.github/workflows/xptag.yml +++ b/.github/workflows/xptag.yml @@ -8,7 +8,7 @@ on: jobs: tag: if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} - uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.18 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.01 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 31a440386912..8a0b173e3cd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -385,9 +385,12 @@ target_include_directories(fmt-header-only # Install targets. if (FMT_INSTALL) if(COMMAND xpExternPackage) + if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(optParams FIND_XPRO_CMAKE) # /utf-8 flag disregarded with CPS + endif() xpExternPackage(REPO_NAME fmt TARGETS_FILE fmt-targets LIBRARIES fmt fmt-header-only DEFAULT_TARGETS fmt - BASE ${FMT_VERSION} XPDIFF "patch" + BASE ${FMT_VERSION} XPDIFF "patch" ${optParams} WEB "https://fmt.dev/" UPSTREAM "github.com/fmtlib/fmt" DESC "A modern formatting library" LICENSE "[MIT](https://github.com/fmtlib/fmt?tab=MIT-1-ov-file#readme 'MIT License')"