Skip to content

Commit 9a55e23

Browse files
smanderssmanders
authored
Merge pull request #14 from externpro/xpupdate-26.01-3-gb158dc4-25473672135-1
externpro 26.01-3-gb158dc4
2 parents 14e1122 + 9cdf920 commit 9a55e23

8 files changed

Lines changed: 33 additions & 30 deletions

File tree

‎.devcontainer‎

‎.github/release-tag.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"message": "xpro version 1.17.0.3 tag",
3-
"tag": "xpv1.17.0.3"
2+
"message": "xpro version 1.17.0.4 tag",
3+
"tag": "xpv1.17.0.4"
44
}

‎.github/workflows/xpbuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
contents: read
1515
pull-requests: write
1616
packages: write
17-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.18
17+
uses: externpro/externpro/.github/workflows/build-linux.yml@26.01
1818
secrets:
1919
automation_token: ${{ secrets.GHCR_TOKEN }}
2020
with: {}
2121
macos:
22-
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.18
22+
uses: externpro/externpro/.github/workflows/build-macos.yml@26.01
2323
secrets: inherit
2424
with: {}
2525
windows:
26-
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.18
26+
uses: externpro/externpro/.github/workflows/build-windows.yml@26.01
2727
secrets: inherit
2828
with: {}

‎.github/workflows/xprelease.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Upload build artifacts as release assets
3535
release-from-build:
3636
if: github.event_name == 'workflow_dispatch'
37-
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.18
37+
uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01
3838
with:
3939
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
4040
permissions:

‎.github/workflows/xptag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
tag:
1010
if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }}
11-
uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.18
11+
uses: externpro/externpro/.github/workflows/tag-release.yml@26.01
1212
with:
1313
merge_sha: ${{ github.event.pull_request.merge_commit_sha }}
1414
pr_number: ${{ github.event.pull_request.number }}

‎CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,12 @@ if(SPDLOG_INSTALL)
359359
set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
360360
set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
361361
if(COMMAND xpExternPackage)
362+
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
363+
set(optParams FIND_XPRO_CMAKE) # /utf-8 flag disregarded with CPS
364+
endif()
362365
xpExternPackage(EXPORT spdlog TARGETS_FILE spdlogConfigTargets
363366
LIBRARIES spdlog spdlog_header_only DEFAULT_TARGETS spdlog
364-
BASE v${SPDLOG_VERSION} XPDIFF "patch" DEPS fmt Threads
367+
BASE v${SPDLOG_VERSION} XPDIFF "patch" ${optParams}
365368
WEB "https://github.com/gabime/spdlog/wiki" UPSTREAM "github.com/gabime/spdlog"
366369
DESC "Fast C++ logging library"
367370
LICENSE "[MIT](https://github.com/gabime/spdlog?tab=License-1-ov-file 'MIT License')"

‎xprodeps.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
|project|license [^_l]|description [dependencies]|version|source|diff [^_d]|
44
|-------|-------------|--------------------------|-------|------|----------|
5-
|<a id='spdlog' />[spdlog](https://github.com/gabime/spdlog/wiki)|[MIT](https://github.com/gabime/spdlog?tab=License-1-ov-file 'MIT License')|Fast C++ logging library [deps: _fmt, Threads_]| |[upstream](https://github.com/gabime/spdlog 'github.com/gabime/spdlog')| [patch]|
6-
|<a id='fmt' />[fmt](https://fmt.dev/)|[MIT](https://github.com/fmtlib/fmt?tab=MIT-1-ov-file#readme 'MIT License')|A modern formatting library|[xpv12.1.0.5](https://github.com/externpro/fmt/releases/tag/xpv12.1.0.5 'release')|[repo](https://github.com/externpro/fmt 'github.com/externpro/fmt') [upstream](https://github.com/fmtlib/fmt 'github.com/fmtlib/fmt')|[diff](https://github.com/externpro/fmt/compare/12.1.0...xpv12.1.0.5 'github.com/externpro/fmt/compare/12.1.0...xpv12.1.0.5') [patch]|
7-
|<a id='Threads' />[Threads](https://cmake.org/cmake/help/latest/module/FindThreads.html)|[LGPL-2.1-or-later](https://spdx.org/licenses/LGPL-2.1-or-later.html 'GNU Lesser General Public License v2.1 or later')|Finds and determines the thread library of the system for multithreading support|[xpv1.0.2](https://github.com/externpro/Threads/releases/tag/xpv1.0.2 'release')|[repo](https://github.com/externpro/Threads 'github.com/externpro/Threads')|[diff](https://github.com/externpro/Threads/compare/v0...xpv1.0.2 'github.com/externpro/Threads/compare/v0...xpv1.0.2') [bin]|
5+
|<a id='spdlog' />[spdlog](https://github.com/gabime/spdlog/wiki)|[MIT](https://github.com/gabime/spdlog?tab=License-1-ov-file 'MIT License')|Fast C++ logging library [deps: _Threads, fmt_]| |[upstream](https://github.com/gabime/spdlog 'github.com/gabime/spdlog')| [patch]|
6+
|<a id='Threads' />[Threads](https://cmake.org/cmake/help/latest/module/FindThreads.html)|[LGPL-2.1-or-later](https://spdx.org/licenses/LGPL-2.1-or-later.html 'GNU Lesser General Public License v2.1 or later')|Finds and determines the thread library of the system for multithreading support|[xpv1.0.3](https://github.com/externpro/Threads/releases/tag/xpv1.0.3 'release')|[repo](https://github.com/externpro/Threads 'github.com/externpro/Threads')|[diff](https://github.com/externpro/Threads/compare/v0...xpv1.0.3 'github.com/externpro/Threads/compare/v0...xpv1.0.3') [bin]|
7+
|<a id='fmt' />[fmt](https://fmt.dev/)|[MIT](https://github.com/fmtlib/fmt?tab=MIT-1-ov-file#readme 'MIT License')|A modern formatting library|[xpv12.1.0.6](https://github.com/externpro/fmt/releases/tag/xpv12.1.0.6 'release')|[repo](https://github.com/externpro/fmt 'github.com/externpro/fmt') [upstream](https://github.com/fmtlib/fmt 'github.com/fmtlib/fmt')|[diff](https://github.com/externpro/fmt/compare/12.1.0...xpv12.1.0.6 'github.com/externpro/fmt/compare/12.1.0...xpv12.1.0.6') [patch]|
88

99
![deps](xprodeps.svg 'dependencies')
1010

‎xprodeps.svg‎

Lines changed: 18 additions & 18 deletions
Loading

0 commit comments

Comments
 (0)