Skip to content

[spdlog] support wchar when target is Windows #18041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 14 commits into from
Jul 15, 2021
Merged

[spdlog] support wchar when target is Windows #18041

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
feea05a
[spdlog] support wchar when targeting Windows
luncliff May 21, 2021
3422ec9
[spdlog] update baseline and git-tree SHA
luncliff May 21, 2021
374bfcc
[spdlog] make wchar_t options to port features
luncliff May 23, 2021
84ccf60
Update ports/spdlog/portfile.cmake
luncliff Jun 4, 2021
404f4f4
Update ports/spdlog/portfile.cmake
luncliff Jun 4, 2021
2210be0
[spdlog] more clear SPDLOG_WCHAR_FILENAMES usage
luncliff Jun 4, 2021
4efff82
Update versions/s-/spdlog.json
JackBoosY Jun 7, 2021
a523704
Update ports/spdlog/vcpkg.json
luncliff Jul 1, 2021
4a8250d
Update ports/spdlog/portfile.cmake
luncliff Jul 1, 2021
19f940e
Update ports/spdlog/portfile.cmake
luncliff Jul 1, 2021
821d658
[spdlog] update version SHA
luncliff Jul 1, 2021
c93b478
Merge branch 'master' into port/spdlog
luncliff Jul 1, 2021
397b994
[spdlog] update port version
luncliff Jul 1, 2021
b6e78a6
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ports/spdlog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,23 @@ vcpkg_from_github(

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
benchmark SPDLOG_BUILD_BENCH
benchmark SPDLOG_BUILD_BENCH
wchar SPDLOG_WCHAR_SUPPORT
)

if(VCPKG_TARGET_IS_WINDOWS)
# configured in triplet file
if(NOT DEFINED SPDLOG_WCHAR_FILENAMES)
set(SPDLOG_WCHAR_FILENAMES OFF)
endif()
else()
Comment thread
luncliff marked this conversation as resolved.
Outdated
if("wchar" IN_LIST FEATURES)
message(FATAL_ERROR "Feature 'wchar' is for Windows.")
Comment thread
luncliff marked this conversation as resolved.
Outdated
elseif(SPDLOG_WCHAR_FILENAMES)
message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.")
endif()
endif()

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED)

vcpkg_cmake_configure(
Expand All @@ -21,6 +35,7 @@ vcpkg_cmake_configure(
-DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_INSTALL=ON
-DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED}
-DSPDLOG_WCHAR_FILENAMES=${SPDLOG_WCHAR_FILENAMES}
Comment thread
PhoebeHui marked this conversation as resolved.
)

vcpkg_cmake_install()
Expand Down
9 changes: 8 additions & 1 deletion ports/spdlog/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "spdlog",
"version-semver": "1.8.5",
"port-version": 2,
"port-version": 3,
"description": "Very fast, header only, C++ logging library",
"homepage": "https://github.com/gabime/spdlog",
"license": "MIT",
"dependencies": [
"fmt",
{
Expand All @@ -21,6 +22,12 @@
"dependencies": [
"benchmark"
]
},
"wchar": {
"description": "Build with wchar_t (Windows only)"
},
"wchar-filenames": {
"description": "Use std::wstring instead of std::string for file names (Windows only)"
Comment thread
luncliff marked this conversation as resolved.
Outdated
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5766,7 +5766,7 @@
},
"spdlog": {
"baseline": "1.8.5",
"port-version": 2
"port-version": 3
},
"spectra": {
"baseline": "0.9.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/spdlog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "789c184d34284ba526062ec6331657eab9a5b64c",
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
"version-semver": "1.8.5",
"port-version": 3
},
{
"git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b",
"version-semver": "1.8.5",
Expand Down