diff options
| author | Josh Blum | 2011-10-25 16:19:53 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-25 19:38:43 -0400 |
| commit | fde3f39419a301d87bb460f9b857e3454d019aa9 (patch) | |
| tree | 79e6117909cd1d1f649ad0a4e9087ec0ae0da5a1 /gr-howto-write-a-block-cmake/cmake | |
| parent | a23f6624c6da8c850ed144916947a3dbff0db885 (diff) | |
| download | gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.tar.gz gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.tar.bz2 gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.zip | |
cmake: fix for find* scripts
Yes there was a misunderstanding and I read the docs wrong.
This change uses the correct lib and inc dirs set by the pkg config macro.
http://techbase.kde.org/Policies/CMake_Coding_Style#Writing_CMake_Find-modules
Diffstat (limited to 'gr-howto-write-a-block-cmake/cmake')
| -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 ffa6582a2..34e85dbcf 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake @@ -5,7 +5,7 @@ FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio - ${PC_GNURADIO_CORE_INCLUDE_DIRS} + ${PC_GNURADIO_CORE_INCLUDE_DIR} PATHS /usr/local/include/gnuradio /usr/include/gnuradio ) @@ -14,7 +14,7 @@ FIND_LIBRARY( GNURADIO_CORE_LIBRARIES NAMES gnuradio-core HINTS $ENV{GNURADIO_CORE_DIR}/lib - ${PC_GNURADIO_CORE_LIBRARIES} + ${PC_GNURADIO_CORE_LIBDIR} PATHS /usr/local/lib /usr/local/lib64 /usr/lib 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 3c21af91d..190c2e339 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake @@ -5,7 +5,7 @@ FIND_PATH( GRUEL_INCLUDE_DIRS NAMES gruel/attributes.h HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDE_DIRS} + ${PC_GRUEL_INCLUDE_DIR} PATHS /usr/local/include /usr/include ) @@ -14,7 +14,7 @@ FIND_LIBRARY( GRUEL_LIBRARIES NAMES gruel HINTS $ENV{GRUEL_DIR}/lib - ${PC_GRUEL_LIBRARIES} + ${PC_GRUEL_LIBDIR} PATHS /usr/local/lib /usr/local/lib64 /usr/lib |