diff options
| author |   Andrej Rode <mail@andrejro.de> | 2019-03-10 19:36:18 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2019-03-10 19:36:18 +0100 |
| commit | 292548e6dafa3c9f2989434da97ae6ededbc823b (patch) | |
| tree | 6ffef1f0a21c27d7552c646f453129aa7434c10b | |
| parent | GnuradioConfig/newmod: find Thrift if it was used by GNU Radio build (diff) | |
| download | gnuradio-292548e6dafa3c9f2989434da97ae6ededbc823b.tar.xz gnuradio-292548e6dafa3c9f2989434da97ae6ededbc823b.zip | |
cmake: use TargetConfig in GnuradioConfig
Previously only the Target.cmake was used. This lead to thrift not being
added to the list of dependencies to call find_dependency() on.
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in | 7 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in index b8778cd10..ad7b2a5e3 100644 --- a/cmake/Modules/GnuradioConfig.cmake.in +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -35,8 +35,8 @@ find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMIN ) find_dependency(Volk) -include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-pmtTargets.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-runtimeTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-pmtConfig.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-runtimeConfig.cmake") cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) @@ -62,9 +62,6 @@ set(GR_RPCSERVER_ENABLED @GR_RPCSERVER_ENABLED@) set(ENABLE_CTRLPORT_THRIFT @ENABLE_CTRLPORT_THRIFT@) set(THRIFT_FOUND @THRIFT_FOUND@) set(GR_RPCSERVER_THRIFT @GR_RPCSERVER_THRIFT@) -if(@THRIFT_FOUND@) - find_package(THRIFT) -endif() # Propagate global options set(GR_RUNTIME_DIR "@GR_RUNTIME_DIR@") diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index c0e4f4155..5aa90a5e1 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -142,6 +142,7 @@ if(ENABLE_CTRLPORT_THRIFT) FIND_PACKAGE(THRIFT) if(THRIFT_FOUND) +list(APPEND EXTRA_DEPS "THRIFT") MATH(EXPR CTRLPORT_BACKENDS "${CTRLPORT_BACKENDS} + 1") # Indicate thrift as an installed backend in the cmake summary. |