From 98ca01bf2dc9206445fa9cd271aaa97d50b99c0a Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 10 Dec 2019 02:40:06 +0200 Subject: [PATCH 1/4] Fix issue #1347 --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f6b0788..282795a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,12 @@ message(STATUS "Build spdlog: ${SPDLOG_VERSION}") #--------------------------------------------------------------------------------------- set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_CXX_EXTENSIONS OFF) + +if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN") + set(CMAKE_CXX_EXTENSIONS ON) +endif() + #--------------------------------------------------------------------------------------- # Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog From c44cf5a720470b977d4be6a3081520b09303a99c Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 10 Dec 2019 02:42:28 +0200 Subject: [PATCH 2/4] Removed extra space --- CMakeLists.txt | 2 +- .../reply/index-2019-12-10T00-41-29-0476.json | 109 ++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 out/build/x64-Debug/.cmake/api/v1/reply/index-2019-12-10T00-41-29-0476.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 282795a7..260f8ae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN") - set(CMAKE_CXX_EXTENSIONS ON) + set(CMAKE_CXX_EXTENSIONS ON) endif() diff --git a/out/build/x64-Debug/.cmake/api/v1/reply/index-2019-12-10T00-41-29-0476.json b/out/build/x64-Debug/.cmake/api/v1/reply/index-2019-12-10T00-41-29-0476.json new file mode 100644 index 00000000..df52a6d8 --- /dev/null +++ b/out/build/x64-Debug/.cmake/api/v1/reply/index-2019-12-10T00-41-29-0476.json @@ -0,0 +1,109 @@ +{ + "cmake" : + { + "generator" : + { + "name" : "Ninja" + }, + "paths" : + { + "cmake" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe", + "cpack" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe", + "ctest" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe", + "root" : "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.14" + }, + "version" : + { + "isDirty" : false, + "major" : 3, + "minor" : 14, + "patch" : 19060802, + "string" : "3.14.19060802-MSVC_2", + "suffix" : "" + } + }, + "objects" : + [ + { + "jsonFile" : "codemodel-v2-8659ce1306b63f468359.json", + "kind" : "codemodel", + "version" : + { + "major" : 2, + "minor" : 0 + } + }, + { + "jsonFile" : "cache-v2-d9117564e4566f11a654.json", + "kind" : "cache", + "version" : + { + "major" : 2, + "minor" : 0 + } + }, + { + "jsonFile" : "cmakeFiles-v1-5db72eed5d94afad5157.json", + "kind" : "cmakeFiles", + "version" : + { + "major" : 1, + "minor" : 0 + } + } + ], + "reply" : + { + "client-MicrosoftVS" : + { + "query.json" : + { + "requests" : + [ + { + "kind" : "cache", + "version" : 2 + }, + { + "kind" : "cmakeFiles", + "version" : 1 + }, + { + "kind" : "codemodel", + "version" : 2 + } + ], + "responses" : + [ + { + "jsonFile" : "cache-v2-d9117564e4566f11a654.json", + "kind" : "cache", + "version" : + { + "major" : 2, + "minor" : 0 + } + }, + { + "jsonFile" : "cmakeFiles-v1-5db72eed5d94afad5157.json", + "kind" : "cmakeFiles", + "version" : + { + "major" : 1, + "minor" : 0 + } + }, + { + "jsonFile" : "codemodel-v2-8659ce1306b63f468359.json", + "kind" : "codemodel", + "version" : + { + "major" : 2, + "minor" : 0 + } + } + ] + } + } + } +} From ab178057db46885a0778d6c1cab7cdbcd8a712e1 Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 10 Dec 2019 03:00:06 +0200 Subject: [PATCH 3/4] Fixed (maybe) #1348 --- include/spdlog/fmt/fmt.h | 5 +++-- include/spdlog/fmt/ostr.h | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index a3762ba9..4741b64f 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -26,8 +26,9 @@ #ifndef FMT_USE_WINDOWS_H #define FMT_USE_WINDOWS_H 0 #endif -#include "bundled/core.h" -#include "bundled/format.h" + +#include +#include #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib #include #include diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h index 9902898f..f82eb679 100644 --- a/include/spdlog/fmt/ostr.h +++ b/include/spdlog/fmt/ostr.h @@ -7,12 +7,14 @@ // // include bundled or external copy of fmtlib's ostream support // + #if !defined(SPDLOG_FMT_EXTERNAL) +#ifdef SPDLOG_HEADER_ONLY #ifndef FMT_HEADER_ONLY #define FMT_HEADER_ONLY #endif -#include "bundled/ostream.h" -#include "fmt.h" +#endif +#include #else #include #endif From 25a702fc225371dbd21fa1345b2e131b16ed9236 Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 10 Dec 2019 03:03:08 +0200 Subject: [PATCH 4/4] Update fmt.h --- include/spdlog/fmt/fmt.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index 4741b64f..c426e2b2 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -26,7 +26,6 @@ #ifndef FMT_USE_WINDOWS_H #define FMT_USE_WINDOWS_H 0 #endif - #include #include #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib