Update appveyor.yml

2025-01-15 17:27:57 +00:00 · 2019-12-05 23:19:31 +02:00 · 2019-12-05 23:03:01 +02:00 · 2019-12-05 22:53:06 +02:00 · 2019-12-05 22:34:36 +02:00 · 2019-12-05 21:24:31 +02:00
4 changed files with 27 additions and 16 deletions
--- a/appveyor.yml
+++ b/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=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
+    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

    cmake --build . --config %BUILD_TYPE%

--- a/cmake/utils.cmake
+++ b/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()


--- a/include/spdlog/fmt/fmt.h
+++ b/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
--- a/src/fmt.cpp
+++ b/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
Author	SHA1	Message	Date
Gabi Melman	1586c4b0c7	Update appveyor.yml	2019-12-05 23:19:31 +02:00
Gabi Melman	9198e97401	Update appveyor.yml	2019-12-05 23:03:01 +02:00
Gabi Melman	346267c82f	Update appveyor.yml	2019-12-05 22:53:06 +02:00
Gabi Melman	529f72325f	Update appveyor.yml	2019-12-05 22:34:36 +02:00
Gabi Melman	1cf1209586	Update appveyor.yml	2019-12-05 21:24:31 +02:00
Gabi Melman	36774529a4	Update appveyor.yml	2019-12-05 20:52:57 +02:00
Gabi Melman	27dcb1008c	Update appveyor.yml	2019-12-05 20:21:04 +02:00
Gabi Melman	e8a9c7b13e	Update appveyor.yml	2019-12-05 20:20:10 +02:00
Gabi Melman	7be59851d5	Update appveyor.yml	2019-12-05 20:13:02 +02:00
Gabi Melman	15cf9ec365	Update appveyor.yml	2019-12-05 18:59:43 +02:00
Gabi Melman	c44c904161	Update appveyor.yml	2019-12-05 18:51:26 +02:00
Gabi Melman	9e3d8d1650	Update appveyor.yml	2019-12-05 18:37:19 +02:00
Gabi Melman	7b9668fe01	Update appveyor.yml	2019-12-05 18:07:43 +02:00
gabime	2334c48e02	Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x	2019-12-05 17:44:48 +02:00
gabime	afb949a417	CMake: - Allow non fatal security wanrnings for msvc 2015 and below	2019-12-05 17:44:38 +02:00
gabime	c9bb85c91d	Revert supress of warning 4996 under msvc 2015	2019-12-05 17:25:12 +02:00
Gabi Melman	13e1667d61	Update appveyor.yml	2019-12-05 16:24:13 +02:00
Gabi Melman	3c106c9cec	Update appveyor.yml	2019-12-05 16:23:11 +02:00
Gabi Melman	1988668d10	Update appveyor.yml	2019-12-05 14:17:10 +02:00
Gabi Melman	484d7f91e5	Added vs2017 to appveyor.yml	2019-12-05 13:42:28 +02:00
gabime	53d58f222f	fix warning C4996 under vs2015 about std::copy in fmt	2019-12-05 13:37:31 +02:00