From 292548e6dafa3c9f2989434da97ae6ededbc823b Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Sun, 10 Mar 2019 19:36:18 +0100
Subject: 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.
---
cmake/Modules/GnuradioConfig.cmake.in | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'cmake/Modules')
diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in
index b8778cd10b..ad7b2a5e39 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@")
--
cgit v1.2.3