From 434f7d78307b2937ef1ac168b98f5b15a027f535 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 19 Jun 2019 21:01:36 +0200 Subject: [PATCH] Tell pkg-config to add more paths to its search Setting PKG_CONFIG_USE_CMAKE_PREFIX_PATH to TRUE. If this variable is not set, this behavior is enabled by default if CMAKE_MINIMUM_REQUIRED_VERSION is 3.1 or later, disabled otherwise. Since our minimum requirement is 2.8.12, we activate it manually. See https://cmake.org/cmake/help/latest/module/FindPkgConfig.html --- cmake/Modules/FindGLOG.cmake | 1 + cmake/Modules/FindGNURADIO.cmake | 1 + cmake/Modules/FindGRDBFCTTC.cmake | 1 + cmake/Modules/FindGRGN3S.cmake | 1 + cmake/Modules/FindGRIIO.cmake | 2 +- cmake/Modules/FindGROSMOSDR.cmake | 1 + cmake/Modules/FindLIBIIO.cmake | 1 + cmake/Modules/FindLIBOSMOSDR.cmake | 1 + cmake/Modules/FindPUGIXML.cmake | 1 + cmake/Modules/FindTELEORBIT.cmake | 1 + cmake/Modules/FindUHD.cmake | 1 + cmake/Modules/FindVOLK.cmake | 1 + cmake/Modules/FindVOLKGNSSSDR.cmake | 1 + 13 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 2ac5ab7fb..c702d4a04 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -41,6 +41,7 @@ else() set(LIB_PATHS ${GLOG_ROOT} ${GLOG_ROOT}/lib) endif() +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_GLOG libglog) diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index 39bc0fcd2..1ed44391f 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -19,6 +19,7 @@ # Find GNU Radio ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGRDBFCTTC.cmake b/cmake/Modules/FindGRDBFCTTC.cmake index 64c838af1..81cd9869b 100644 --- a/cmake/Modules/FindGRDBFCTTC.cmake +++ b/cmake/Modules/FindGRDBFCTTC.cmake @@ -19,6 +19,7 @@ # Find GR-DBFCTTC Module ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_GR_DBFCTTC gr-dbfcttc) diff --git a/cmake/Modules/FindGRGN3S.cmake b/cmake/Modules/FindGRGN3S.cmake index 4664a6edb..8b407544b 100644 --- a/cmake/Modules/FindGRGN3S.cmake +++ b/cmake/Modules/FindGRGN3S.cmake @@ -19,6 +19,7 @@ # Find GR-GN3S Module ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_GR_GN3S gr-gn3s) diff --git a/cmake/Modules/FindGRIIO.cmake b/cmake/Modules/FindGRIIO.cmake index 720313b15..1baf6fc6c 100644 --- a/cmake/Modules/FindGRIIO.cmake +++ b/cmake/Modules/FindGRIIO.cmake @@ -20,7 +20,7 @@ # Gnuradio::iio # - +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_IIO gnuradio-iio) diff --git a/cmake/Modules/FindGROSMOSDR.cmake b/cmake/Modules/FindGROSMOSDR.cmake index e655a20d8..25a2763f2 100644 --- a/cmake/Modules/FindGROSMOSDR.cmake +++ b/cmake/Modules/FindGROSMOSDR.cmake @@ -39,6 +39,7 @@ # +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(GROSMOSDR_PKG gnuradio-osmosdr) diff --git a/cmake/Modules/FindLIBIIO.cmake b/cmake/Modules/FindLIBIIO.cmake index 4c94bb9dd..dddf7e750 100644 --- a/cmake/Modules/FindLIBIIO.cmake +++ b/cmake/Modules/FindLIBIIO.cmake @@ -20,6 +20,7 @@ # Iio::iio # +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_LIBIIO libiio) diff --git a/cmake/Modules/FindLIBOSMOSDR.cmake b/cmake/Modules/FindLIBOSMOSDR.cmake index 5db152d21..7ecf41a61 100644 --- a/cmake/Modules/FindLIBOSMOSDR.cmake +++ b/cmake/Modules/FindLIBOSMOSDR.cmake @@ -32,6 +32,7 @@ # Osmosdr::osmosdr # +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(LIBOSMOSDR_PKG libosmosdr) diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake index 2868b63bd..95c8d3273 100644 --- a/cmake/Modules/FindPUGIXML.cmake +++ b/cmake/Modules/FindPUGIXML.cmake @@ -27,6 +27,7 @@ # Pugixml::pugixml # +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_PUGIXML pugixml QUIET) diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index bdb3d861c..a99cab845 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with GNSS-SDR. If not, see . +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_TELEORBIT teleorbit) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 286a1cacb..81e3879b9 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -23,6 +23,7 @@ ######################################################################## # Find the library for the USRP Hardware Driver ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_UHD uhd) diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index e788e509c..e04afd1ca 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -24,6 +24,7 @@ # Find VOLK (Vector-Optimized Library of Kernels) ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_VOLK volk QUIET) diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake index 57abd1d99..7f0ab1ff3 100644 --- a/cmake/Modules/FindVOLKGNSSSDR.cmake +++ b/cmake/Modules/FindVOLKGNSSSDR.cmake @@ -25,6 +25,7 @@ # Find VOLK (Vector-Optimized Library of Kernels) GNSS-SDR library ######################################################################## +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) pkg_check_modules(PC_VOLK_GNSSSDR volk_gnsssdr)