diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-18 12:24:38 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-18 12:24:38 -0400 |
| commit | d1745250133ea6e14b426f8f0c1659a8a0916797 (patch) | |
| tree | 381ce71cf165dc5f910aa4dca9941690dd8ca095 /gr-vocoder/lib | |
| parent | ed3b5b165663ae8aad652295fd0b8513aeabc7ff (diff) | |
build: better support for static libs.
Now builds shared libraries with ControlPort (if ControlPort is enableed). Static libs still without ControlPort.
Added proper Option and output message in cmake for Static Libs on/off.
Diffstat (limited to 'gr-vocoder/lib')
| -rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index 61c973b699..716e9117fd 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -163,6 +163,18 @@ target_link_libraries(gnuradio-vocoder ${vocoder_libs}) GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel") if(ENABLE_STATIC_LIBS) + if(ENABLE_GR_CTRLPORT) + # Remove GR_CTRLPORT set this target's definitions. + # Makes sure we don't try to use ControlPort stuff in source files + # since Ice will not work with static libs. + GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS) + list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT") + SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}") + + # readd it to the target since we removed it from the directory-wide list. + SET_PROPERTY(TARGET gnuradio-vocoder APPEND PROPERTY COMPILE_DEFINITIONS "GR_CTRLPORT") + endif(ENABLE_GR_CTRLPORT) + add_library(gnuradio-vocoder_static STATIC ${gr_vocoder_sources}) if(NOT WIN32) |