Skip to content

[spdlog] Fix the non-Windows build issue by scoping the define to Windows targets. #27740

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 1 commit into from
Nov 14, 2022
Merged

[spdlog] Fix the non-Windows build issue by scoping the define to Windows targets. #27740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ports/spdlog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h
"// #define SPDLOG_FMT_EXTERNAL"
"#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif"
)
if(SPDLOG_WCHAR_SUPPORT)
if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS)
Copy link
Copy Markdown
Member

@BillyONeal BillyONeal Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm weakly against defending against unsupported configurations like this but I don't think it's that "harmful". I would not expect future edits to this port to preserve this behavior, for instance.

vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h
"// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT"
"#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif"
Expand Down
5 changes: 3 additions & 2 deletions ports/spdlog/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "spdlog",
"version-semver": "1.10.0",
"port-version": 1,
"port-version": 2,
"description": "Very fast, header only, C++ logging library",
"homepage": "https://github.com/gabime/spdlog",
"license": "MIT",
Expand All @@ -24,7 +24,8 @@
]
},
"wchar": {
"description": "Build with wchar_t (Windows only)"
"description": "Build with wchar_t (Windows only)",
"supports": "windows"
}
}
}
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 @@ -7062,7 +7062,7 @@
},
"spdlog": {
"baseline": "1.10.0",
"port-version": 1
"port-version": 2
},
"spectra": {
"baseline": "1.0.1",
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": "f7ad0e9d934ce7401fb68968f5392fddc7dd4e3a",
"version-semver": "1.10.0",
"port-version": 2
},
{
"git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572",
"version-semver": "1.10.0",
Expand Down