From 20630ec6d1eac18ddcd09a074c1edf18c4e9f27f Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 6 Oct 2012 07:57:18 -0700 Subject: [PATCH] cmake: additional fixes from GNU Radio HOWTO * Fix include dir in FindGruel * Remove QUIET option that requires CMake 2.8.2, not yet on all distros --- cmake/Modules/FindGnuradioCore.cmake | 2 +- cmake/Modules/FindGruel.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindGnuradioCore.cmake b/cmake/Modules/FindGnuradioCore.cmake index 87012ab..3773588 100644 --- a/cmake/Modules/FindGnuradioCore.cmake +++ b/cmake/Modules/FindGnuradioCore.cmake @@ -1,5 +1,5 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core QUIET) +PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS diff --git a/cmake/Modules/FindGruel.cmake b/cmake/Modules/FindGruel.cmake index 190c2e3..c7a10a4 100644 --- a/cmake/Modules/FindGruel.cmake +++ b/cmake/Modules/FindGruel.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET) +PKG_CHECK_MODULES(PC_GRUEL gnuradio-core) FIND_PATH( GRUEL_INCLUDE_DIRS NAMES gruel/attributes.h HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDE_DIR} + ${PC_GRUEL_INCLUDEDIR} PATHS /usr/local/include /usr/include )