diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-11-26 06:35:53 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-11-25 14:35:53 -0800 |
| commit | ca1e2ec6b30a0a3830fca950a9dd0b55202fd1ec (patch) | |
| tree | 3c08d7f1a8abd3e80cf9fa8a86e56b2d7b942b1b /ports/spdlog/fix-uwp.patch | |
| parent | a3ab4500a4fbe26bdd6b8a671e2a1dc44112f5eb (diff) | |
| download | vcpkg-ca1e2ec6b30a0a3830fca950a9dd0b55202fd1ec.tar.gz vcpkg-ca1e2ec6b30a0a3830fca950a9dd0b55202fd1ec.zip | |
[spdlog]Update to 1.4.2 (#8779)
* [spdlog]Upgrade version to 1.4.2
* [spdlog]Do not remove these libraries.
* [spdlog]Fix error C4275 when use fmt.
* [spdlog]Re-fix C4275 error.
* [spdlog]Re-fix C4275 error.
* [spdlog]Disable build on uwp.
* [spdlog]Fix build with uwp.
Diffstat (limited to 'ports/spdlog/fix-uwp.patch')
| -rw-r--r-- | ports/spdlog/fix-uwp.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ports/spdlog/fix-uwp.patch b/ports/spdlog/fix-uwp.patch new file mode 100644 index 000000000..42811122b --- /dev/null +++ b/ports/spdlog/fix-uwp.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35425db..28c555a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,7 +128,7 @@ if(SPDLOG_FMT_EXTERNAL) + target_link_libraries(spdlog_header_only INTERFACE fmt::fmt) + + if (WIN32) +- target_compile_options(spdlog PRIVATE /wd4275) ++ target_compile_options(spdlog PRIVATE /wd4275 /wd4100) + endif() + + set(PKG_CONFIG_REQUIRES fmt) # add dependecy to pkg-config +diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h +index f436b0d..82f3510 100644 +--- a/include/spdlog/details/os-inl.h ++++ b/include/spdlog/details/os-inl.h +@@ -128,7 +128,7 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f) + { + + #ifdef _WIN32 +-#if !defined(__cplusplus_winrt) ++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) + auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(f))); + if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0)) + SPDLOG_THROW(spdlog_ex("SetHandleInformation failed", errno)); |