Exclude CMake CXX standard from MSVC

This commit is contained in:
Jack Andersen 2020-04-10 19:01:21 -10:00
parent 35e5c7c90f
commit 4648c93b8e
1 changed files with 19 additions and 10 deletions

View File

@ -1,8 +1,10 @@
cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17 cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
project(kabufuda) project(kabufuda)
set(CMAKE_CXX_STANDARD 17) if (NOT MSVC)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
add_library(kabufuda STATIC add_library(kabufuda STATIC
include/kabufuda/Constants.hpp include/kabufuda/Constants.hpp
@ -20,21 +22,28 @@ if(WIN32)
if (MSVC) if (MSVC)
target_compile_options(kabufuda PRIVATE target_compile_options(kabufuda PRIVATE
# Enforce various standards compliant behavior. # Enforce various standards compliant behavior.
/permissive- $<$<COMPILE_LANGUAGE:CXX>:/permissive->
# Enable standard volatile semantics. # Enable standard volatile semantics.
/volatile:iso $<$<COMPILE_LANGUAGE:CXX>:/volatile:iso>
# Reports the proper value for the __cplusplus preprocessor macro. # Reports the proper value for the __cplusplus preprocessor macro.
/Zc:__cplusplus $<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>
# Use latest C++ standard.
$<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>
)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# Flags for MSVC (not clang-cl)
target_compile_options(kabufuda PRIVATE
# Allow constexpr variables to have explicit external linkage. # Allow constexpr variables to have explicit external linkage.
/Zc:externConstexpr $<$<COMPILE_LANGUAGE:CXX>:/Zc:externConstexpr>
# Assume that new throws exceptions, allowing better code generation. # Assume that new throws exceptions, allowing better code generation.
/Zc:throwingNew $<$<COMPILE_LANGUAGE:CXX>:/Zc:throwingNew>
) )
endif() endif()
endif()
target_sources(kabufuda PRIVATE target_sources(kabufuda PRIVATE
include/kabufuda/winsupport.hpp include/kabufuda/winsupport.hpp