18 lines
776 B
Diff
18 lines
776 B
Diff
diff -U 3 -dHrN -- a/cmake_modules/compiler_options.cmake b/cmake_modules/compiler_options.cmake
|
|
--- a/cmake_modules/compiler_options.cmake 2017-09-26 00:21:15.000000000 +0200
|
|
+++ b/cmake_modules/compiler_options.cmake 2017-11-05 08:22:16.662695768 +0100
|
|
@@ -64,10 +64,13 @@
|
|
#set(CMAKE_LIBRARY_ARCHITECTURE x86)
|
|
else()
|
|
# c++11 options
|
|
+ check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG)
|
|
check_cxx_compiler_flag(-std=c++11 HAS_CXX11_FLAG)
|
|
check_cxx_compiler_flag(-std=c++0x HAS_CXX0X_FLAG)
|
|
|
|
- if(HAS_CXX11_FLAG)
|
|
+ if(HAS_CXX14_FLAG)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
|
+ elseif(HAS_CXX11_FLAG)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
|
elseif(HAS_CXX0X_FLAG)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|