From a03d827cdffd10380811dab0114c284b2753bcde Mon Sep 17 00:00:00 2001 From: r-a-sattarov Date: Sat, 26 Oct 2019 19:56:09 +0300 Subject: [PATCH] =?UTF-8?q?Force=20activation=20=D0=A1++11=20for=20GCC/Cla?= =?UTF-8?q?ng/MCST=20lcc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added GCC/Clang/MCST lcc compiler check for support of C++11 standard and force activation C++11 flag for compile. E2K: fixed compile for MCST lcc compiler < 1.24 (default C++ standard in 1.23 is -std=c++03). --- neo/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index a5db8a03..0724e734 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -86,6 +86,16 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") #add_definitions(-Wall) add_definitions(-Werror=format-security) add_definitions(-Werror=format) + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) + CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) + if(COMPILER_SUPPORTS_CXX11) + add_definitions(-std=c++11) + elseif(COMPILER_SUPPORTS_CXX0X) + add_definitions(-std=c++0x) + else() + message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + endif() if(CPU_TYPE) add_definitions(-DCPUSTRING="${CPU_TYPE}") endif()