diff options
| author | Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> | 2019-12-09 16:06:51 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-12-19 18:20:22 +0100 |
| commit | 33db846ff87dc67a3ba3465bcdb31232cee9fe6b (patch) | |
| tree | 2278124efb5c0ff6a9aef087c34e1b16de71e8d5 /CMakeLists.txt | |
| parent | bd588eb03e2a897e419b5009f4f82b7d45b57cad (diff) | |
declare enable-testing earlier and without dependency to boost as requested by michaelld
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ce51a1d0a7..9a842fb981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,6 @@ project(gnuradio CXX C) enable_testing() option(BUILD_SHARED_LIBS "Build shared libraries" ON) -OPTION(ENABLE_TESTING "Enable testing support" ON) - # Make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) @@ -48,6 +46,9 @@ GR_CHECK_BUILD_TYPE(${CMAKE_BUILD_TYPE}) SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") +include(GrComponent) +GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING) + # Set the version information here SET(VERSION_MAJOR 3) SET(VERSION_API 9) @@ -378,10 +379,6 @@ GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON SIX_FOUND ) -GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING - Boost_FOUND -) - if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage") include(CodeCoverage) setup_target_for_coverage(coverage "ctest || exit 0" coverage) |