Merge pull request #4703 from ligfx/cmake_cxx_standard

CMake: Use CMAKE_CXX_STANDARD instead of passing -std=c++14
dolphin-emu · Mar 16, 2017 · 3b1dae5 · 3b1dae5
2 parents 8e6d256 + c464029
commit 3b1dae5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -1,7 +1,6 @@
-check_and_add_flag(CXX14 -std=c++14)
-if(NOT FLAG_CXX_CXX14)
-  check_and_add_flag(HAS_CXX1Y -std=c++1y)
-endif()
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-DNOMINMAX)