Enable C++11 by default

qgis · Oct 20, 2016 · a6a4f2e · 3nids · Oct 20, 2016 · m-kuhn
1 parent 8064148
commit a6a4f2e
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -346,23 +346,8 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 #   or definitely Apple LLVM 5.0 (based on LLVM 3.3svn, in Xcode 5+):
 #   https://gist.github.com/yamaya/2924292
 
-IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-  IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
-    SET(USE_CXX_11 TRUE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  ENDIF()
-ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2")
-       OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1"))
-    SET(USE_CXX_11 TRUE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing")
-  ENDIF()
-ELSEIF (MSVC AND MSVC_VERSION GREATER 1600)
-  SET(USE_CXX_11 TRUE)
-ELSE()
-  SET(USE_CXX_11 FALSE)
-ENDIF()
+SET(CMAKE_CXX_STANDARD 11)
+SET(USE_CXX_11 TRUE)
 
 #allow override keyword if available
 IF(NOT USE_CXX_11)