diff options
| author | Johnathan Corgan | 2012-02-05 10:43:09 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-05 10:43:09 -0800 |
| commit | 1023c48cc7e05a0d6c9ae72587304a86c57d6ca8 (patch) | |
| tree | 086d1c53db5f794a375c9b9749c2d368ed26e3ea | |
| parent | ae4770a0781d5ecab3b5ccce2fe037c0c52407c5 (diff) | |
| parent | e6805a25568a5ce24937039f57a6eb1df1f82aa9 (diff) | |
| download | gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.tar.gz gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.tar.bz2 gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.zip | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake | 4 | ||||
| -rw-r--r-- | gr-shd/CMakeLists.txt | 2 |
6 files changed, 8 insertions, 8 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 diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake index b45cf95e6..3773588a7 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_CORE QUIET gnuradio-core) +PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio - ${PC_GNURADIO_CORE_INCLUDE_DIR} + ${PC_GNURADIO_CORE_INCLUDEDIR} PATHS /usr/local/include/gnuradio /usr/include/gnuradio ) diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake index 56b8b1773..58dff7044 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL QUIET gnuradio-core) +PKG_CHECK_MODULES(PC_GRUEL gruel) 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 ) diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt index de9daf540..a1b3b1a0b 100644 --- a/gr-shd/CMakeLists.txt +++ b/gr-shd/CMakeLists.txt @@ -22,7 +22,7 @@ ######################################################################## include(GrBoost) -PKG_CHECK_MODULES(PC_SHD shd QUIET) +PKG_CHECK_MODULES(PC_SHD shd) FIND_PATH( SHD_INCLUDE_DIRS NAMES shd/config.hpp |