From 62170b3d0692e0f94e44158418c0fef4051be0f2 Mon Sep 17 00:00:00 2001 From: Eric Womer Date: Sat, 28 Dec 2019 13:20:13 -0500 Subject: [PATCH] CMakeLists.txt: Use CMAKE_CXX_STANDARD to specify c++11 compile flags instead of hardcoding -std=c++11 since that causes issues with C files, specifically with clang [9.0] --- neo/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index fec6b9d1..0ad09288 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -93,9 +93,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") 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) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) elseif(COMPILER_SUPPORTS_CXX0X) - add_definitions(-std=c++0x) + set(CMAKE_CXX_STANDARD 0x) + set(CMAKE_CXX_STANDARD_REQUIRED ON) else() message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") endif()