Update appveyor.yml

appveyor.yml

@@ -1,32 +1,36 @@
 version: 1.0.{build}
-image: Visual Studio 2015
+image: Visual Studio 2017
 environment:
   matrix:
-  - GENERATOR: '"MinGW Makefiles"'
-    BUILD_TYPE: Debug
-  - GENERATOR: '"MinGW Makefiles"'
-    BUILD_TYPE: Release
   - GENERATOR: '"Visual Studio 14 2015"'
     BUILD_TYPE: Debug
+    WCHAR: 'OFF'
   - GENERATOR: '"Visual Studio 14 2015"'
     BUILD_TYPE: Release
+    WCHAR: 'ON'
   - GENERATOR: '"Visual Studio 14 2015 Win64"'
     BUILD_TYPE: Debug
+    WCHAR: 'ON'
   - GENERATOR: '"Visual Studio 14 2015 Win64"'
     BUILD_TYPE: Release
+    WCHAR: 'ON'
+  - GENERATOR: '"Visual Studio 15 2017 Win64"'
+    BUILD_TYPE: Debug
+    WCHAR: 'ON'
+  - GENERATOR: '"Visual Studio 15 2017 Win64"'
+    BUILD_TYPE: Release
+    WCHAR: 'OFf'
 build_script:
 - cmd: >-
     set
-
+    
     mkdir build
+    
+    cd build 
 
-    cd build
+    set PATH=%PATH%:C:\Program Files\Git\usr\bin
-
+    
-    set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+    cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=%WCHAR% -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_EXAMPLE_HO=ON -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=OFF
-
-    set PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
-
-    cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=ON -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_EXAMPLE_HO=ON -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=OFF
 
     cmake --build . --config %BUILD_TYPE%
 

cmake/utils.cmake

@@ -29,7 +29,10 @@ function(spdlog_enable_warnings target_name)
     target_compile_options(${target_name} PRIVATE
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
             -Wall -Wextra -Wconversion -pedantic -Wfatal-errors>
-        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>)
+        $<$<CXX_COMPILER_ID:MSVC>:/W4>)
+		if(MSVC_VERSION GREATER_EQUAL  1910)  #Allow non fatal security wanrnings for msvc 2015 
+			target_compile_options(${target_name} PRIVATE /WX)
+		endif()
 endfunction()
 
 

include/spdlog/fmt/fmt.h

@@ -14,7 +14,8 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
+#endif // __GNUC__ || __clang__
+
 
 #if !defined(SPDLOG_FMT_EXTERNAL)
 #ifdef SPDLOG_HEADER_ONLY
@@ -32,6 +33,7 @@
 #include <fmt/format.h>
 #endif
 
+// pop warnings supressions
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
+#endif

src/fmt.cpp

@@ -15,6 +15,8 @@
 #if !defined(SPDLOG_FMT_EXTERNAL)
 #include "spdlog/fmt/bundled/format-inl.h"
 
+
+// pop warnings supressions
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif