diff options
author | Johnathan Corgan | 2012-02-05 10:44:40 -0800 |
---|---|---|
committer | Johnathan Corgan | 2012-02-05 10:44:40 -0800 |
commit | 89e32f4031d68b5f2a819f1923808958f931edb7 (patch) | |
tree | d0f3f074d9bb8b7257ea8bd68341d3707f0bb7a0 /cmake | |
parent | 6063ef0108a5382427519e4b99555ac7a0eee730 (diff) | |
parent | 1023c48cc7e05a0d6c9ae72587304a86c57d6ca8 (diff) | |
download | gnuradio-89e32f4031d68b5f2a819f1923808958f931edb7.tar.gz gnuradio-89e32f4031d68b5f2a819f1923808958f931edb7.tar.bz2 gnuradio-89e32f4031d68b5f2a819f1923808958f931edb7.zip |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 2 | ||||
-rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 2 | ||||
-rw-r--r-- | cmake/Modules/FindUHD.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake index 29c9ba4ff..9af308f84 100644 --- a/cmake/Modules/FindCppUnit.cmake +++ b/cmake/Modules/FindCppUnit.cmake @@ -10,7 +10,7 @@ # CPPUNIT_FOUND, If false, do not try to use CppUnit. INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_CPPUNIT QUIET "cppunit") +PKG_CHECK_MODULES(PC_CPPUNIT "cppunit") FIND_PATH(CPPUNIT_INCLUDE_DIRS NAMES cppunit/TestCase.h diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index beb5c189e..078108958 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -4,7 +4,7 @@ # Find single-precision (float) version of FFTW3 INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_FFTW3F QUIET "fftw3f >= 3.0") +PKG_CHECK_MODULES(PC_FFTW3F "fftw3f >= 3.0") FIND_PATH( FFTW3F_INCLUDE_DIRS diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 6a7956b2c..b4d12b6d7 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -3,7 +3,7 @@ ######################################################################## INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_UHD QUIET uhd) +PKG_CHECK_MODULES(PC_UHD uhd) FIND_PATH( UHD_INCLUDE_DIRS |