From c7fd8c553e106bd19c5c9609d429d7317e514976 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 10 Dec 2014 22:56:33 +0000 Subject: [PATCH] and adjust for our use case again --- bluedevil/src/daemon/helpers/authorize/CMakeLists.txt | 2 +- bluedevil/src/daemon/kded/CMakeLists.txt | 2 +- bluedevil/src/fileitemactionplugin/CMakeLists.txt | 2 +- bluedevil/src/kcmodule/CMakeLists.txt | 6 +++--- bluedevil/src/kio/bluetooth/CMakeLists.txt | 2 +- bluedevil/src/kio/obexftp/daemon/CMakeLists.txt | 2 +- bluedevil/src/monolithic/CMakeLists.txt | 2 +- bluedevil/src/sendfile/CMakeLists.txt | 2 +- bluedevil/src/wizard/CMakeLists.txt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt index d307c9b6..02e7d9e2 100644 --- a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt @@ -6,7 +6,7 @@ set(authorize_SRCS kde4_add_executable(bluedevil-authorize ${authorize_SRCS}) target_link_libraries(bluedevil-authorize - ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES}) + ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-authorize DESTINATION ${LIBEXEC_INSTALL_DIR}) diff --git a/bluedevil/src/daemon/kded/CMakeLists.txt b/bluedevil/src/daemon/kded/CMakeLists.txt index c3960c09..452c495d 100644 --- a/bluedevil/src/daemon/kded/CMakeLists.txt +++ b/bluedevil/src/daemon/kded/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(kded_bluedevil ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} - ${LibBlueDevil_LIBRARIES} + bluedevil ) install(TARGETS kded_bluedevil DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/bluedevil/src/fileitemactionplugin/CMakeLists.txt b/bluedevil/src/fileitemactionplugin/CMakeLists.txt index 27fce338..bdcafac3 100644 --- a/bluedevil/src/fileitemactionplugin/CMakeLists.txt +++ b/bluedevil/src/fileitemactionplugin/CMakeLists.txt @@ -1,4 +1,4 @@ kde4_add_plugin(bluetoothfiletiemaction sendfileitemaction.cpp) -target_link_libraries(bluetoothfiletiemaction ${KDE4_KIO_LIBS} ${LibBlueDevil_LIBRARIES}) +target_link_libraries(bluetoothfiletiemaction ${KDE4_KIO_LIBS} bluedevil) install(TARGETS bluetoothfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES bluedevilsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR}) \ No newline at end of file diff --git a/bluedevil/src/kcmodule/CMakeLists.txt b/bluedevil/src/kcmodule/CMakeLists.txt index 6888a52c..6c311283 100644 --- a/bluedevil/src/kcmodule/CMakeLists.txt +++ b/bluedevil/src/kcmodule/CMakeLists.txt @@ -28,9 +28,9 @@ qt4_automoc(${kcm_bluedevildevices} ${kcm_bluedeviladapters} ${kcm_bluedeviltransfer}) -target_link_libraries(kcm_bluedevildevices ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES}) -target_link_libraries(kcm_bluedeviladapters ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES}) -target_link_libraries(kcm_bluedeviltransfer ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES}) +target_link_libraries(kcm_bluedevildevices ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} bluedevil) +target_link_libraries(kcm_bluedeviladapters ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} bluedevil) +target_link_libraries(kcm_bluedeviltransfer ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} bluedevil) install(TARGETS kcm_bluedevildevices kcm_bluedeviladapters diff --git a/bluedevil/src/kio/bluetooth/CMakeLists.txt b/bluedevil/src/kio/bluetooth/CMakeLists.txt index ef1f1e22..85820bc4 100644 --- a/bluedevil/src/kio/bluetooth/CMakeLists.txt +++ b/bluedevil/src/kio/bluetooth/CMakeLists.txt @@ -11,7 +11,7 @@ target_link_libraries(kio_bluetooth ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} - ${LibBlueDevil_LIBRARIES} + bluedevil ) ########### install files ############### diff --git a/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt b/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt index 00320a77..330a6144 100644 --- a/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt +++ b/bluedevil/src/kio/obexftp/daemon/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(kded_obexftpdaemon ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} - ${LibBlueDevil_LIBRARIES} + bluedevil ) install(TARGETS kded_obexftpdaemon DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/bluedevil/src/monolithic/CMakeLists.txt b/bluedevil/src/monolithic/CMakeLists.txt index 7cd40c54..349b7123 100644 --- a/bluedevil/src/monolithic/CMakeLists.txt +++ b/bluedevil/src/monolithic/CMakeLists.txt @@ -7,7 +7,7 @@ qt4_add_dbus_interface(monolithic_SRCS org.bluez.Audio.xml audio_interface) kde4_add_executable(bluedevil-monolithic ${monolithic_SRCS}) -target_link_libraries(bluedevil-monolithic ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES}) +target_link_libraries(bluedevil-monolithic ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-monolithic ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES bluedevil-monolithic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/bluedevil/src/sendfile/CMakeLists.txt b/bluedevil/src/sendfile/CMakeLists.txt index fa52d170..6c0cc28a 100644 --- a/bluedevil/src/sendfile/CMakeLists.txt +++ b/bluedevil/src/sendfile/CMakeLists.txt @@ -28,7 +28,7 @@ qt4_add_dbus_interface(sendfilehelper_SRCS org.bluez.obex.Transfer1.xml obexd_tr kde4_add_executable(bluedevil-sendfile ${sendfilehelper_SRCS}) target_link_libraries(bluedevil-sendfile - ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${LibBlueDevil_LIBRARIES}) + ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} bluedevil) install(TARGETS bluedevil-sendfile DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES bluedevil-sendfile.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/bluedevil/src/wizard/CMakeLists.txt b/bluedevil/src/wizard/CMakeLists.txt index 847e6729..869db820 100644 --- a/bluedevil/src/wizard/CMakeLists.txt +++ b/bluedevil/src/wizard/CMakeLists.txt @@ -24,7 +24,7 @@ kde4_add_ui_files(wizard_SRCS kde4_add_executable(bluedevil-wizard ${wizard_SRCS}) target_link_libraries(bluedevil-wizard - ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES}) + ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) install(TARGETS bluedevil-wizard ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES bluedevil-wizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})