File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ environment:
41
41
- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
42
42
configuration : Release
43
43
platform : x86
44
- CXX_FLAGS : " /permissive- /std:c++latest /utf-8 /W4 /WX"
44
+ CXX_FLAGS : " /permissive- /std:c++17 /utf-8 /W4 /WX"
45
45
CMAKE_OPTIONS : " "
46
46
GENERATOR : Visual Studio 15 2017
47
47
@@ -62,7 +62,7 @@ environment:
62
62
- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
63
63
configuration : Release
64
64
platform : x64
65
- CXX_FLAGS : " /permissive- /std:c++latest /Zc:__cplusplus /utf-8 /W4 /WX"
65
+ CXX_FLAGS : " /permissive- /std:c++17 /Zc:__cplusplus /utf-8 /W4 /WX"
66
66
CMAKE_OPTIONS : " "
67
67
GENERATOR : Visual Studio 15 2017
68
68
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSIO
31
31
unset (compiler_supports_cpp_17 )
32
32
endif ()
33
33
# MSVC 2015 (14.0) does not support C++17
34
- if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.1 )
34
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10 )
35
35
unset (compiler_supports_cpp_17 )
36
36
endif ()
37
37
# GCC 5 and 6 do claim experimental support for C++17, but do not implement <optional>
@@ -43,6 +43,10 @@ endif()
43
43
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0 )
44
44
unset (compiler_supports_cpp_20 )
45
45
endif ()
46
+ # MSVC 2017 (15.x) does not support C++20
47
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20 )
48
+ unset (compiler_supports_cpp_20 )
49
+ endif ()
46
50
# GCC started supporting C++20 features in 8.0 but a test for #3070 segfaults prior to 9.0
47
51
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0 )
48
52
unset (compiler_supports_cpp_20 )
You can’t perform that action at this time.
0 commit comments