Skip to content

Commit a6a4f2e

Browse files
committed
Enable C++11 by default
1 parent 8064148 commit a6a4f2e

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

CMakeLists.txt

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -346,23 +346,8 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
346346
# or definitely Apple LLVM 5.0 (based on LLVM 3.3svn, in Xcode 5+):
347347
# https://gist.github.com/yamaya/2924292
348348

349-
IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
350-
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
351-
IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
352-
SET(USE_CXX_11 TRUE)
353-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
354-
ENDIF()
355-
ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
356-
IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2")
357-
OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1"))
358-
SET(USE_CXX_11 TRUE)
359-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing")
360-
ENDIF()
361-
ELSEIF (MSVC AND MSVC_VERSION GREATER 1600)
362-
SET(USE_CXX_11 TRUE)
363-
ELSE()
364-
SET(USE_CXX_11 FALSE)
365-
ENDIF()
349+
SET(CMAKE_CXX_STANDARD 11)
350+
SET(USE_CXX_11 TRUE)
366351

367352
#allow override keyword if available
368353
IF(NOT USE_CXX_11)

0 commit comments

Comments
 (0)