From 3e7c061f3020bf6d5cf5cff47a144e9a23f427ea Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 24 Sep 2011 08:34:46 -0700
Subject: howto: updated find gruel and core modules to match recommended style
---
gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake | 8 ++++----
gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'gr-howto-write-a-block-cmake')
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 f76364acfd..ffa6582a26 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(GNURADIO_CORE gnuradio-core)
-IF(NOT GNURADIO_CORE_FOUND)
+PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core QUIET)
FIND_PATH(
GNURADIO_CORE_INCLUDE_DIRS
NAMES gr_random.h
HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
+ ${PC_GNURADIO_CORE_INCLUDE_DIRS}
PATHS /usr/local/include/gnuradio
/usr/include/gnuradio
)
@@ -14,6 +14,7 @@ FIND_LIBRARY(
GNURADIO_CORE_LIBRARIES
NAMES gnuradio-core
HINTS $ENV{GNURADIO_CORE_DIR}/lib
+ ${PC_GNURADIO_CORE_LIBRARIES}
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
@@ -22,5 +23,4 @@ FIND_LIBRARY(
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
-
-ENDIF(NOT GNURADIO_CORE_FOUND)
+MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
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 c142c905ef..3c21af91de 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(GRUEL gnuradio-core)
-IF(NOT GRUEL_FOUND)
+PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET)
FIND_PATH(
GRUEL_INCLUDE_DIRS
NAMES gruel/attributes.h
HINTS $ENV{GRUEL_DIR}/include
+ ${PC_GRUEL_INCLUDE_DIRS}
PATHS /usr/local/include
/usr/include
)
@@ -14,6 +14,7 @@ FIND_LIBRARY(
GRUEL_LIBRARIES
NAMES gruel
HINTS $ENV{GRUEL_DIR}/lib
+ ${PC_GRUEL_LIBRARIES}
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
@@ -22,5 +23,4 @@ FIND_LIBRARY(
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GRUEL DEFAULT_MSG GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS)
-
-ENDIF(NOT GRUEL_FOUND)
+MARK_AS_ADVANCED(GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS)
--
cgit v1.2.3
From f139fb7bf2a13f6c61c416de1c35db04ce509240 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 24 Sep 2011 11:58:19 -0700
Subject: howto: various fixes for howto example
---
gr-howto-write-a-block-cmake/lib/CMakeLists.txt | 6 +++---
gr-howto-write-a-block-cmake/swig/CMakeLists.txt | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'gr-howto-write-a-block-cmake')
diff --git a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt
index 798bc6ad62..a2b6da9507 100644
--- a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt
+++ b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt
@@ -30,9 +30,9 @@ SET_TARGET_PROPERTIES(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EX
# Install built library files
########################################################################
INSTALL(TARGETS gnuradio-howto
- LIBRARY DESTINATION ${LIB_SUFFIX}/lib # .so/.dylib file
- ARCHIVE DESTINATION ${LIB_SUFFIX}/lib # .lib file
- RUNTIME DESTINATION bin # .dll file
+ LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
+ RUNTIME DESTINATION bin # .dll file
)
########################################################################
diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
index 40f2b1051e..fdf8d8c482 100644
--- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
+++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
@@ -26,6 +26,7 @@ IF(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
RETURN()
ENDIF()
INCLUDE(GrSwig)
+INCLUDE(GrPython)
########################################################################
# Setup swig generation
--
cgit v1.2.3