diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
| commit | 2514481b42ebdeec28649582fc666955cf206c84 (patch) | |
| tree | 60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/spdlog/fix-uwp.patch | |
| parent | b751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff) | |
| parent | 28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff) | |
| download | vcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
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)); |