diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-18 16:10:45 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-18 16:10:45 -0400 |
| commit | 1fdbcc890f810f031e105be4f00cf9ef516056cb (patch) | |
| tree | f565a1198e5eb336e3de3eef95a1d34d23f2a030 /gr-uhd/lib | |
| parent | ca36e1c42f19baafb648695bd5e2a4462fe98803 (diff) | |
| parent | 93db96faa81b260367908e977f15c0d7a45358db (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index f926b81332..9121dd41b8 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -76,16 +76,3 @@ list(APPEND uhd_libs add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) target_link_libraries(gnuradio-uhd ${uhd_libs}) GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel") - -if(ENABLE_STATIC_LIBS) - add_library(gnuradio-uhd_static STATIC ${uhd_sources}) - - if(NOT WIN32) - set_target_properties(gnuradio-uhd_static - PROPERTIES OUTPUT_NAME gnuradio-uhd) - endif(NOT WIN32) - - install(TARGETS gnuradio-uhd_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "uhd_devel" # .lib file - ) -endif(ENABLE_STATIC_LIBS)
\ No newline at end of file |