From 030c787cfa1693dcc849aaec940c687fe0e96665 Mon Sep 17 00:00:00 2001
From: Dimitri Stolnikov <horiz0n@gmx.net>
Date: Mon, 2 Apr 2012 21:42:24 +0200
Subject: cmake & autotools fixes from previous commit

---
 src/CMakeLists.txt | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac350e6..78ca7f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,26 +30,28 @@ add_library(rtlsdr SHARED
 
 target_link_libraries(rtlsdr
     ${LIBUSB_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
 )
 
 set_target_properties(rtlsdr PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS")
 
-add_library(rtlsdrs STATIC
+add_library(rtlsdr_static STATIC
     rtl-sdr.c
     tuner_e4000.c
     tuner_fc0012.c
     tuner_fc0013.c
+    tuner_fc2580.c
 )
-target_link_libraries(rtlsdrs
+
+target_link_libraries(rtlsdr_static
     ${LIBUSB_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
 )
-set_target_properties(rtlsdrs PROPERTIES DEFINE_SYMBOL "rtlsdr_STATIC")
+
+set_target_properties(rtlsdr_static PROPERTIES DEFINE_SYMBOL "rtlsdr_STATIC")
+set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr)
 ########################################################################
 # Install built library files
 ########################################################################
-install(TARGETS rtlsdr
+install(TARGETS rtlsdr rtlsdr_static
     LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file
     ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     RUNTIME DESTINATION bin              # .dll file
@@ -59,4 +61,7 @@ install(TARGETS rtlsdr
 # Build utility
 ########################################################################
 add_executable(rtl_sdr main.c)
-target_link_libraries(rtl_sdr rtlsdr ${LIBUSB_LIBRARIES})
+target_link_libraries(rtl_sdr rtlsdr_static
+    ${LIBUSB_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+)
-- 
cgit v1.3.1