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 /gr-howto-write-a-block-cmake/cmake/Modules | |
| parent | ae4770a0781d5ecab3b5ccce2fe037c0c52407c5 (diff) | |
| parent | e6805a25568a5ce24937039f57a6eb1df1f82aa9 (diff) | |
| download | gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.tar.gz gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.tar.bz2 gnuradio-1023c48cc7e05a0d6c9ae72587304a86c57d6ca8.zip | |
Merge branch 'maint'
Diffstat (limited to 'gr-howto-write-a-block-cmake/cmake/Modules')
| -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 |
2 files changed, 4 insertions, 4 deletions
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 ) |