From a4cf9be8e0afdc2674c482791179d70e7312ae5d Mon Sep 17 00:00:00 2001 From: Anton Matosov Date: Mon, 5 Jan 2015 01:06:57 +0200 Subject: [PATCH] Enabled C++11 for tests target --- unittests/CMakeLists.txt | 10 ++++++++++ unittests/Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index d264ae8cdc..ec3e4104ec 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -19,6 +19,16 @@ function(add_gtest) endforeach() endfunction() +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) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +elseif(COMPILER_SUPPORTS_CXX0X) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +else() + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") +endif() # add each test # todo: add mixer_test sbus2_test st24_test sf0x_test diff --git a/unittests/Makefile b/unittests/Makefile index 5faa50bb5f..038e8b8f7f 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -1,7 +1,7 @@ CC=g++ CFLAGS=-I. -I../src/modules -I ../src/include -I../src/drivers \ - -I../src -I../src/lib -D__EXPORT="" -Dnullptr="0" -lm + -I../src -I../src/lib -D__EXPORT="" -Dnullptr="0" -lm -std=c++11 # Points to the root of Google Test, relative to where this file is. # Remember to tweak this if you move this file.