diff options
| author | Jeff Long <willcode4@gmail.com> | 2021-09-08 18:43:48 -0400 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2021-09-19 01:14:16 -0700 |
| commit | 384af841bff61a0971f0bd6344ee3ab123dd7a30 (patch) | |
| tree | f7ff5c77ae45781a7c4cc8000f632f00c12133cd | |
| parent | 1970ee19ed8cf7203799682761547dd4cc97a5cd (diff) | |
cmake: include GrBoost after (was before) version restriction
Fix provided in issue by jwmelto
Signed-off-by: Jeff Long <willcode4@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ed37cdfae..feff39c34f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,14 +40,6 @@ string(TIMESTAMP BUILD_DATE_SHORT "%Y-%m-%d" UTC) message(STATUS "Build date set to ${BUILD_DATE}.") include(GrComponent) -######################################################################## -# Setup Boost for global use (within this build) -# Do this before enabling testing support, as it depends -# on unit_test_framework -######################################################################## -include(GrBoost) -GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING - Boost_UNIT_TEST_FRAMEWORK_FOUND ) # Set the version information here SET(VERSION_MAJOR 3) @@ -70,6 +62,15 @@ set(VOLK_MIN_VERSION "2.4.1") ## first version with CPU features set(PYBIND11_MIN_VERSION "2.4") # pybind11 sets versions like 2.4.dev4, which compares < 2.4.3 set(GR_THRIFT_MIN_VERSION "0.13") +######################################################################## +# Setup Boost for global use (within this build) +# Do this before enabling testing support, as it depends +# on unit_test_framework +######################################################################## +include(GrBoost) +GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING + Boost_UNIT_TEST_FRAMEWORK_FOUND ) + # Enable generation of compile_commands.json for code completion engines set(CMAKE_EXPORT_COMPILE_COMMANDS ON) |