diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-12-12 15:31:18 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-12-12 15:31:18 -0800 |
| commit | 080f2d212daac9297c7f3e3dbe7bd5a13b176c0d (patch) | |
| tree | ae0397849c31f617fab78c347317eb0057c5205d | |
| parent | e6a648a80786f58b79689a4cc5697aecf38f3f08 (diff) | |
| parent | 0ee2298b82a20ab13da022e1991be13f5272d581 (diff) | |
Merge branch 'master' into next
| -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/Modules/FindGnuradioCore.cmake | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block/cmake/Modules/FindGruel.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake index c3a5d96819..29c9ba4ffe 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 "cppunit" QUIET) +PKG_CHECK_MODULES(PC_CPPUNIT QUIET "cppunit") FIND_PATH(CPPUNIT_INCLUDE_DIRS NAMES cppunit/TestCase.h diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index 252af25227..beb5c189e5 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 "fftw3f >= 3.0" QUIET) +PKG_CHECK_MODULES(PC_FFTW3F QUIET "fftw3f >= 3.0") FIND_PATH( FFTW3F_INCLUDE_DIRS diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index a9c64c7009..6a7956b2c2 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -3,7 +3,7 @@ ######################################################################## INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_UHD uhd QUIET) +PKG_CHECK_MODULES(PC_UHD QUIET uhd) FIND_PATH( UHD_INCLUDE_DIRS diff --git a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake index 34e85dbcfa..b45cf95e6d 100644 --- a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block/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 QUIET gnuradio-core) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS diff --git a/gr-howto-write-a-block/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block/cmake/Modules/FindGruel.cmake index 190c2e3390..56b8b1773b 100644 --- a/gr-howto-write-a-block/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block/cmake/Modules/FindGruel.cmake @@ -1,5 +1,5 @@ INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET) +PKG_CHECK_MODULES(PC_GRUEL QUIET gnuradio-core) FIND_PATH( GRUEL_INCLUDE_DIRS |