File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,11 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/arch" )
18
18
set ( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /lib" )
19
19
set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /bin" )
20
20
21
- set ( CMAKE_CXX_STANDARD 20 )
21
+ if ( MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "Clang" ) AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ))
22
+ set ( CMAKE_CXX_STANDARD 17 )
23
+ else ()
24
+ set ( CMAKE_CXX_STANDARD 20 )
25
+ endif ()
22
26
23
27
if ( UNIX )
24
28
set (COMMON_COMPILER_FLAGS
@@ -61,7 +65,7 @@ if( UNIX )
61
65
endif ()
62
66
63
67
if ( MSVC )
64
- if (CMAKE_C_COMPILER_ID STREQUAL "Clang" )
68
+ if (( CMAKE_C_COMPILER_ID STREQUAL "Clang" ) AND ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) )
65
69
set (COMMON_COMPILER_FLAGS
66
70
"-Wno-tautological-pointer-compare \
67
71
-Wno-ignored-attributes" )
You can’t perform that action at this time.
0 commit comments