diff options
| author | Josh Blum | 2013-09-15 14:44:44 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-09-15 14:44:44 -0700 |
| commit | e25fe808cf6a20e9469d1380d497e23205a379b6 (patch) | |
| tree | 0a6bec03be4a30fbfb332f37a175e9fa1dafc312 /cmake | |
| parent | 6961a794356d413f81bfbf347ed84619b1125d22 (diff) | |
| download | gnuradio-e25fe808cf6a20e9469d1380d497e23205a379b6.tar.gz gnuradio-e25fe808cf6a20e9469d1380d497e23205a379b6.tar.bz2 gnuradio-e25fe808cf6a20e9469d1380d497e23205a379b6.zip | |
gr: added util hooks for GR_MOAR_LIBRARIES
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 3e80846d6..b9ab38fc6 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -129,6 +129,9 @@ endfunction(GR_LIBTOOL) # Also handle gnuradio custom naming conventions w/ extras mode. ######################################################################## function(GR_LIBRARY_FOO target) + + target_link_libraries(${target} ${GR_MOAR_LIBRARIES}) + #parse the arguments for component names include(CMakeParseArgumentsCopy) CMAKE_PARSE_ARGUMENTS(GR_LIBRARY "" "RUNTIME_COMPONENT;DEVEL_COMPONENT" "" ${ARGN}) diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index b9bf0bb0b..505fe104c 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -105,6 +105,8 @@ endfunction(GR_SWIG_MAKE_DOCS) macro(GR_SWIG_MAKE name) set(ifiles ${ARGN}) + list(APPEND GR_SWIG_LIBRARIES ${GR_MOAR_LIBRARIES}) + #do swig doc generation if specified if (GR_SWIG_DOC_FILE) set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS}) |