diff options
| author | Daniel Agar <daniel@agar.ca> | 2015-01-06 08:38:08 -0500 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2015-01-06 08:38:08 -0500 |
| commit | e23b73e41507f071231253bef518cdb7346fcbc0 (patch) | |
| tree | c94a64cd9daeb7a6411ddb3f233963991bf088d7 /unittests | |
| parent | 50e27f60add1e5cd1b61736e6fe82a51060dd5f5 (diff) | |
| parent | 4a3145f0edaaad570e6e0a86fd4d44e6c988afbb (diff) | |
| download | px4-firmware-e23b73e41507f071231253bef518cdb7346fcbc0.tar.gz px4-firmware-e23b73e41507f071231253bef518cdb7346fcbc0.tar.bz2 px4-firmware-e23b73e41507f071231253bef518cdb7346fcbc0.zip | |
Merge remote-tracking branch 'upstream/master' into unittests
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 02e2a4d90..05d5fb214 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -2,6 +2,17 @@ cmake_minimum_required(VERSION 2.8) project(unittests) enable_testing() +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() + set(GTEST_DIR gtest) add_subdirectory(${GTEST_DIR}) include_directories(${GTEST_DIR}/include) @@ -11,8 +22,6 @@ include_directories(${CMAKE_SOURCE_DIR}/../src/modules) include_directories(${CMAKE_SOURCE_DIR}/../src/lib) add_definitions(-D__EXPORT=) -set(CMAKE_C_FLAGS "-std=c99") -set(CMAKE_CXX_FLAGS "-std=c++11 -Wno-write-strings") # check add_custom_target(unittests COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure) |