aboutsummaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorAnton Matosov <anton.matosov@gmail.com>2015-01-05 01:06:57 +0200
committerAnton Matosov <anton.matosov@gmail.com>2015-01-05 12:02:32 +0200
commita4cf9be8e0afdc2674c482791179d70e7312ae5d (patch)
tree7ce2cdfc676f55e85100795961109253e460e977 /unittests
parent8fadbdcf2fee463498228abeac038260f51460b1 (diff)
downloadpx4-firmware-a4cf9be8e0afdc2674c482791179d70e7312ae5d.tar.gz
px4-firmware-a4cf9be8e0afdc2674c482791179d70e7312ae5d.tar.bz2
px4-firmware-a4cf9be8e0afdc2674c482791179d70e7312ae5d.zip
Enabled C++11 for tests target
Diffstat (limited to 'unittests')
-rw-r--r--unittests/CMakeLists.txt10
-rw-r--r--unittests/Makefile2
2 files changed, 11 insertions, 1 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index d264ae8cd..ec3e4104e 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 5faa50bb5..038e8b8f7 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.