diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
| commit | 675afc063c9ca5ccec3ede43d87aac83c1928182 (patch) | |
| tree | f342b9a24c8c5e93cadce05fc8714001fc0e2ac9 /gr-vocoder/lib | |
| parent | e2ede2ef8e46762369816d7d66425aee9dca5d1e (diff) | |
| parent | c7692c32cd91c0e98672ce0e997d35f9d3461dd3 (diff) | |
Merge remote-tracking branch 'github/nuke-cpack' into next
Conflicts:
gr-vocoder/CMakeLists.txt
Diffstat (limited to 'gr-vocoder/lib')
| -rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index a8fc874d31..5e806a2c2c 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -103,7 +103,7 @@ endif(LIBGSM_LIBRARIES) add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) target_link_libraries(gnuradio-vocoder ${vocoder_libs}) -GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel") +GR_LIBRARY_FOO(gnuradio-vocoder) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -125,6 +125,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-vocoder_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "vocoder_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) |