From 77a6003b87423246997ecb67b235f3cffb96dc1c Mon Sep 17 00:00:00 2001 From: Michael M Date: Wed, 27 Sep 2017 15:46:25 -0700 Subject: [PATCH] CMake: don't use -std=c++1z Some toolchains provide enough of C++17 to conflict with Dolphin's included backport of std::variant and std::optional. Specifically, the recently-released macOS 10.13 SDK does not provide the or headers, but does provide `in_place_t` in the header. --- Source/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b5a92a5c1b..71ed5876c5 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -20,12 +20,9 @@ else() # CMAKE_CXX_STANDARD cannot be used here because we require C++14 or newer, not any standard. check_and_add_flag(CXX17 -std=c++17) if(NOT FLAG_CXX_CXX17) - check_and_add_flag(CXX1Z -std=c++1z) - if (NOT FLAG_CXX_CXX1Z) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - endif() + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) endif() # These compat headers must not be in the include path when building with MSVC,