Merge pull request #6089 from ligfx/noc++1z

CMake: don't use -std=c++1z
2017-09-28 17:51:57 +02:00 · 2017-09-28 17:51:57 +02:00 · 98210e7b7e
parent 5b750c4ac5 77a6003b87
commit 98210e7b7e
1 changed files with 3 additions and 6 deletions
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@ -20,13 +20,10 @@ 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()
-  endif()

  # These compat headers must not be in the include path when building with MSVC,
  # because it currently does not support __has_include_next / #include_next.