From fde3f39419a301d87bb460f9b857e3454d019aa9 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 25 Oct 2011 16:19:53 -0700
Subject: 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
---
gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake | 4 ++--
gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'gr-howto-write-a-block-cmake/cmake/Modules')
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 ffa6582a26..34e85dbcfa 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 3c21af91de..190c2e3390 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
--
cgit v1.2.3