From: Manuel Bachmann Date: Mon, 21 Dec 2015 12:37:24 +0000 (+0100) Subject: Fix Radio and Audio plugin symbols X-Git-Tag: blowfish_2.0.1~331^2~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=e853da4bd1cb44b6a992aff96a4066ae5bd54720;p=src%2Fapp-framework-binder.git Fix Radio and Audio plugin symbols radio-api/audio-api.so were not valid, because they were not linked correctly with librtlsdr/ALSA. Signed-off-by: Manuel Bachmann --- diff --git a/plugins/audio/CMakeLists.txt b/plugins/audio/CMakeLists.txt index b5adc643..7fa1f75f 100644 --- a/plugins/audio/CMakeLists.txt +++ b/plugins/audio/CMakeLists.txt @@ -1,9 +1,9 @@ IF(alsa_FOUND) - INCLUDE_DIRECTORIES(${include_dirs}) - ADD_LIBRARY(audio-api MODULE audio-api.c audio-alsa.c) SET_TARGET_PROPERTIES(audio-api PROPERTIES PREFIX "") + TARGET_LINK_LIBRARIES(audio-api ${link_libraries}) + INCLUDE_DIRECTORIES(${include_dirs}) INSTALL(TARGETS audio-api LIBRARY DESTINATION ${plugin_install_dir}) diff --git a/plugins/radio/CMakeLists.txt b/plugins/radio/CMakeLists.txt index c7c85411..04d0fa21 100644 --- a/plugins/radio/CMakeLists.txt +++ b/plugins/radio/CMakeLists.txt @@ -1,9 +1,9 @@ IF(librtlsdr_FOUND) - INCLUDE_DIRECTORIES(${include_dirs}) - ADD_LIBRARY(radio-api MODULE radio-api.c radio-rtlsdr.c) SET_TARGET_PROPERTIES(radio-api PROPERTIES PREFIX "") + TARGET_LINK_LIBRARIES(radio-api ${link_libraries}) + INCLUDE_DIRECTORIES(${include_dirs}) INSTALL(TARGETS radio-api LIBRARY DESTINATION ${plugin_install_dir}) diff --git a/plugins/samples/CMakeLists.txt b/plugins/samples/CMakeLists.txt index ef5b449e..aa22cd24 100644 --- a/plugins/samples/CMakeLists.txt +++ b/plugins/samples/CMakeLists.txt @@ -2,10 +2,12 @@ INCLUDE_DIRECTORIES(${include_dirs}) ADD_LIBRARY(helloWorld-api MODULE HelloWorld.c) SET_TARGET_PROPERTIES(helloWorld-api PROPERTIES PREFIX "") +TARGET_LINK_LIBRARIES(helloWorld-api ${link_libraries}) INSTALL(TARGETS helloWorld-api LIBRARY DESTINATION ${plugin_install_dir}) ADD_LIBRARY(samplePost-api MODULE SamplePost.c) SET_TARGET_PROPERTIES(samplePost-api PROPERTIES PREFIX "") +TARGET_LINK_LIBRARIES(samplePost-api ${link_libraries}) INSTALL(TARGETS samplePost-api LIBRARY DESTINATION ${plugin_install_dir}) diff --git a/plugins/session/CMakeLists.txt b/plugins/session/CMakeLists.txt index ddd185df..ab0596e6 100644 --- a/plugins/session/CMakeLists.txt +++ b/plugins/session/CMakeLists.txt @@ -1,6 +1,7 @@ -INCLUDE_DIRECTORIES(${include_dirs}) ADD_LIBRARY(token-api MODULE token-api.c) SET_TARGET_PROPERTIES(token-api PROPERTIES PREFIX "") +TARGET_LINK_LIBRARIES(token-api ${link_libraries}) +INCLUDE_DIRECTORIES(${include_dirs}) INSTALL(TARGETS token-api LIBRARY DESTINATION ${plugin_install_dir})