From 26beea0090ba6285a2dbe3a10da1cde3bb2255bd Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 10 Feb 2020 21:57:14 +0000 Subject: [PATCH] generic: fix most of the overlinking issues see commit in kdelibs repository Signed-off-by: Ivailo Monev --- gwenview/lib/CMakeLists.txt | 6 +- kdeplasma-addons/applets/icontasks/CMakeLists.txt | 10 +- kget/CMakeLists.txt | 8 +- kmix/CMakeLists.txt | 207 ++++++++++++---------- kmix/core/MediaController.cpp | 25 --- kmix/gui/kmixdockwidget.cpp | 2 +- krfb/CMakeLists.txt | 2 +- kvkbd/src/CMakeLists.txt | 23 +-- 8 files changed, 143 insertions(+), 140 deletions(-) diff --git a/gwenview/lib/CMakeLists.txt b/gwenview/lib/CMakeLists.txt index 97415817..2a7ee252 100644 --- a/gwenview/lib/CMakeLists.txt +++ b/gwenview/lib/CMakeLists.txt @@ -111,12 +111,14 @@ set_source_files_properties( kde4_add_kcfg_files(gwenviewlib_SRCS gwenviewconfig.kcfgc) add_library(gwenviewlib SHARED ${gwenviewlib_SRCS}) -set_target_properties(gwenviewlib PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) +set_target_properties(gwenviewlib PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) target_link_libraries(gwenviewlib ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_PHONON_LIBS} ${KDE4_KDCRAW_LIBS} ${JPEG_LIBRARY} ${EXIV2_LIBRARIES} diff --git a/kdeplasma-addons/applets/icontasks/CMakeLists.txt b/kdeplasma-addons/applets/icontasks/CMakeLists.txt index ba7d431f..3e384047 100644 --- a/kdeplasma-addons/applets/icontasks/CMakeLists.txt +++ b/kdeplasma-addons/applets/icontasks/CMakeLists.txt @@ -69,10 +69,16 @@ qt4_add_dbus_interface_ex(tasks_SRCS org.freedesktop.MediaPlayer.player.xml play kde4_add_plugin(plasma_applet_icontasks ${tasks_SRCS}) -target_link_libraries(plasma_applet_icontasks ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${DBUSMENUQT_LIBRARIES} ${KDE4WORKSPACE_TASKMANAGER_LIBS}) +target_link_libraries(plasma_applet_icontasks + ${KDE4_KDEUI_LIBS} + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${DBUSMENUQT_LIBRARIES} + ${KDE4WORKSPACE_TASKMANAGER_LIBS} +) if(Q_WS_X11) - target_link_libraries(plasma_applet_icontasks ${X11_LIBRARIES}) + target_link_libraries(plasma_applet_icontasks ${X11_X11_LIB}) endif(Q_WS_X11) include_directories(${CMAKE_BINARY_DIR} ${DBUSMENUQT_INCLUDE_DIR}) diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt index 9b64344e..297b3288 100644 --- a/kget/CMakeLists.txt +++ b/kget/CMakeLists.txt @@ -217,7 +217,13 @@ qt4_add_dbus_adaptor(kget_SRCS dbus/org.kde.kget.main.xml dbus/dbuskgetwrapper.h add_executable(kget ${kget_SRCS}) -target_link_libraries(kget ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_KCMUTILS_LIBRARY} kgetcore ${KDE4_KNOTIFYCONFIG_LIBS}) +target_link_libraries(kget + ${KDE4_KDEUI_LIBRARY} + ${KDE4_KIO_LIBRARY} + ${KDE4_KCMUTILS_LIBRARY} + ${KDE4_KNOTIFYCONFIG_LIBS} + kgetcore +) if (QGPGME_FOUND) target_link_libraries(kget ${QGPGME_LIBRARIES}) diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index e0611e22..1a340ada 100644 --- a/kmix/CMakeLists.txt +++ b/kmix/CMakeLists.txt @@ -1,8 +1,5 @@ project(kmix) -# Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt. -#find_package(Phonon REQUIRED) - macro_optional_find_package(Alsa) macro_log_feature(ALSA_FOUND "Alsa" "Advanced Linux Sound Architecture" "https://alsa-project.org/wiki/Main_Page" FALSE "" "ALSA is needed for kmix sound feedback") @@ -12,16 +9,14 @@ macro_optional_find_package(PulseAudio "${PA_VER}") macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" "http://www.pulseaudio.org/" FALSE "${PA_VER}" "libpulse is needed to let KMix control PulseAudio") -find_package(GLIB2) - macro_optional_find_package(Canberra) macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") -add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) +add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100) -include_directories(${KDE4_INCLUDES} ${GLIB2_INCLUDE_DIR} /usr/lib/oss/include) +include_directories(${KDE4_INCLUDES} /usr/lib/oss/include) include(CheckCXXSourceCompiles) @@ -42,18 +37,19 @@ add_subdirectory( profiles ) #add_subdirectory( tests ) if (ALSA_FOUND) - add_definitions(-DHAVE_ALSA) - include_directories(${ALSA_INCLUDES}) + add_definitions(-DHAVE_ALSA) + include_directories(${ALSA_INCLUDES}) endif (ALSA_FOUND) +message(STATUS "PULSEAUDIO_DEFINITIONS: ${PULSEAUDIO_DEFINITIONS}") if (PULSEAUDIO_FOUND) - add_definitions(-DHAVE_PULSE) - include_directories(${PULSEAUDIO_INCLUDE_DIR}) + add_definitions(-DHAVE_PULSE ${PULSEAUDIO_DEFINITIONS}) + include_directories(${PULSEAUDIO_INCLUDE_DIR}) endif (PULSEAUDIO_FOUND) if (CANBERRA_FOUND) - add_definitions(-DHAVE_CANBERRA) - include_directories(${CANBERRA_INCLUDE_DIRS}) + add_definitions(-DHAVE_CANBERRA) + include_directories(${CANBERRA_INCLUDE_DIRS}) endif (CANBERRA_FOUND) @@ -69,81 +65,88 @@ qt4_add_dbus_adaptor( kmix_adaptor_SRCS dbus/org.kde.kmix.mixset.xml dbus/dbusmixsetwrapper.h DBusMixSetWrapper ) set(kmix_backend_SRCS - backends/mixer_backend.cpp - backends/mixer_mpris2.cpp - ) + backends/mixer_backend.cpp + backends/mixer_mpris2.cpp +) if (ALSA_FOUND) - set(kmix_backend_SRCS ${kmix_backend_SRCS} - backends/mixer_alsa9.cpp ) + set(kmix_backend_SRCS ${kmix_backend_SRCS} + backends/mixer_alsa9.cpp ) endif (ALSA_FOUND) if (PULSEAUDIO_FOUND) - set(kmix_backend_SRCS ${kmix_backend_SRCS} - backends/mixer_pulse.cpp ) + set(kmix_backend_SRCS ${kmix_backend_SRCS} + backends/mixer_pulse.cpp ) endif (PULSEAUDIO_FOUND) set(kmix_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} - apps/main.cpp - apps/kmix.cpp - apps/KMixApp.cpp - gui/kmixdockwidget.cpp - gui/kmixprefdlg.cpp - gui/viewbase.cpp - gui/viewdockareapopup.cpp - gui/viewsliders.cpp - gui/mixdevicewidget.cpp - gui/mdwmoveaction.cpp - gui/mdwslider.cpp - gui/mdwenum.cpp - gui/kmixerwidget.cpp - gui/ksmallslider.cpp - gui/verticaltext.cpp - gui/volumeslider.cpp - gui/kmixtoolbox.cpp - gui/dialogaddview.cpp - gui/dialogviewconfiguration.cpp - gui/dialogselectmaster.cpp - gui/dialogchoosebackends.cpp - gui/guiprofile.cpp - gui/osdwidget.cpp - core/MediaController.cpp - core/mixertoolbox.cpp - core/kmixdevicemanager.cpp - core/ControlManager.cpp -# core/ControlPool.cpp - core/GlobalConfig.cpp - core/MasterControl.cpp - core/mixer.cpp - core/mixset.cpp - core/mixdevice.cpp - core/mixdevicecomposite.cpp - core/volume.cpp - ) + apps/main.cpp + apps/kmix.cpp + apps/KMixApp.cpp + gui/kmixdockwidget.cpp + gui/kmixprefdlg.cpp + gui/viewbase.cpp + gui/viewdockareapopup.cpp + gui/viewsliders.cpp + gui/mixdevicewidget.cpp + gui/mdwmoveaction.cpp + gui/mdwslider.cpp + gui/mdwenum.cpp + gui/kmixerwidget.cpp + gui/ksmallslider.cpp + gui/verticaltext.cpp + gui/volumeslider.cpp + gui/kmixtoolbox.cpp + gui/dialogaddview.cpp + gui/dialogviewconfiguration.cpp + gui/dialogselectmaster.cpp + gui/dialogchoosebackends.cpp + gui/guiprofile.cpp + gui/osdwidget.cpp + core/MediaController.cpp + core/mixertoolbox.cpp + core/kmixdevicemanager.cpp + core/ControlManager.cpp + # core/ControlPool.cpp + core/GlobalConfig.cpp + core/MasterControl.cpp + core/mixer.cpp + core/mixset.cpp + core/mixdevice.cpp + core/mixdevicecomposite.cpp + core/volume.cpp +) add_executable(kmix ${kmix_SRCS}) -target_link_libraries(kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) +target_link_libraries(kmix + ${KDE4_SOLID_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_PLASMA_LIBS} + ${QT_QTXML_LIBRARY} +) if (ALSA_FOUND) target_link_libraries(kmix ${ALSA_LIBRARIES}) endif (ALSA_FOUND) if (PULSEAUDIO_FOUND) - target_link_libraries(kmix ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES}) + target_link_libraries(kmix ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) endif (PULSEAUDIO_FOUND) if (CANBERRA_FOUND) - target_link_libraries(kmix ${CANBERRA_LIBRARIES}) + target_link_libraries(kmix ${CANBERRA_LIBRARIES}) endif (CANBERRA_FOUND) -install(TARGETS kmix DESTINATION ${KDE4_LIB_INSTALL_DIR} ) - -install(TARGETS kmix ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( + TARGETS kmix + DESTINATION ${KDE4_LIB_INSTALL_DIR} + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### next target ############### - set(kded_kmixd_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} +set(kded_kmixd_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} apps/kmixd.cpp core/ControlManager.cpp # core/ControlPool.cpp @@ -156,25 +159,29 @@ install(TARGETS kmix ${INSTALL_TARGETS_DEFAULT_ARGS} ) core/volume.cpp core/mixertoolbox.cpp core/kmixdevicemanager.cpp - ) +) #qt4_add_dbus_adaptor(kded_kmixd_SRCS org.kde.KMixD.xml kmixd.h Mixer) kde4_add_plugin(kded_kmixd ${kded_kmixd_SRCS}) -target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) +target_link_libraries(kded_kmixd + ${KDE4_KDEUI_LIBS} + ${KDE4_SOLID_LIBS} + ${QT_QTXML_LIBRARY} +) if (ALSA_FOUND) target_link_libraries(kded_kmixd ${ALSA_LIBRARIES}) endif (ALSA_FOUND) if (PULSEAUDIO_FOUND) - target_link_libraries(kded_kmixd ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES}) + target_link_libraries(kded_kmixd ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) endif (PULSEAUDIO_FOUND) if (CANBERRA_FOUND) - target_link_libraries(kded_kmixd ${CANBERRA_LIBRARIES}) + target_link_libraries(kded_kmixd ${CANBERRA_LIBRARIES}) endif (CANBERRA_FOUND) install(TARGETS kded_kmixd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) @@ -182,57 +189,63 @@ install(TARGETS kded_kmixd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) #target_link_libraries( kmixd kded_kmixd ) #install(TARGETS kmixd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} ) -install( FILES kmixd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded ) +install(FILES kmixd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}/kded) ########### next target ############### set(kmixctrl_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} - apps/kmixctrl.cpp - core/ControlManager.cpp -# core/ControlPool.cpp - core/GlobalConfig.cpp - core/MasterControl.cpp - core/MediaController.cpp - core/mixer.cpp - core/mixset.cpp - core/mixdevice.cpp - core/volume.cpp - core/mixertoolbox.cpp - core/kmixdevicemanager.cpp - ) + apps/kmixctrl.cpp + core/ControlManager.cpp + # core/ControlPool.cpp + core/GlobalConfig.cpp + core/MasterControl.cpp + core/MediaController.cpp + core/mixer.cpp + core/mixset.cpp + core/mixdevice.cpp + core/volume.cpp + core/mixertoolbox.cpp + core/kmixdevicemanager.cpp +) # gui/guiprofile.cpp add_executable(kmixctrl ${kmixctrl_SRCS}) -target_link_libraries(kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) +target_link_libraries(kmixctrl + ${KDE4_KDEUI_LIBS} + ${KDE4_SOLID_LIBS} + ${QT_QTXML_LIBRARY} +) if (ALSA_FOUND) target_link_libraries(kmixctrl ${ALSA_LIBRARIES}) endif (ALSA_FOUND) if (PULSEAUDIO_FOUND) - target_link_libraries(kmixctrl ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY} ${GLIB2_LIBRARIES}) + target_link_libraries(kmixctrl ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY}) endif (PULSEAUDIO_FOUND) if (CANBERRA_FOUND) - target_link_libraries(kmixctrl ${CANBERRA_LIBRARIES}) + target_link_libraries(kmixctrl ${CANBERRA_LIBRARIES}) endif (CANBERRA_FOUND) ########### next target ############### add_subdirectory( plasma ) -install( TARGETS kmixctrl DESTINATION ${KDE4_LIB_INSTALL_DIR} ) - -install( TARGETS kmixctrl ${INSTALL_TARGETS_DEFAULT_ARGS} ) - -install( PROGRAMS kmix.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) -install( PROGRAMS apps/kmixremote DESTINATION ${KDE4_BIN_INSTALL_DIR} ) -install( FILES restore_kmix_volumes.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) -install( FILES kmix_autostart.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) -install( FILES kmixui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmix ) -install( FILES kmixctrl_restore.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.mixer.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) -install( FILES dbus/org.kde.kmix.mixset.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} ) +install( + TARGETS kmixctrl + DESTINATION ${KDE4_LIB_INSTALL_DIR} + ${INSTALL_TARGETS_DEFAULT_ARGS} +) + +install(PROGRAMS kmix.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) +install(PROGRAMS apps/kmixremote DESTINATION ${KDE4_BIN_INSTALL_DIR}) +install(FILES restore_kmix_volumes.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install(FILES kmix_autostart.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR}) +install(FILES kmixui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kmix) +install(FILES kmixctrl_restore.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR}) +install(FILES dbus/org.kde.kmix.control.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) +install(FILES dbus/org.kde.kmix.mixer.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) +install(FILES dbus/org.kde.kmix.mixset.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}) diff --git a/kmix/core/MediaController.cpp b/kmix/core/MediaController.cpp index 9af793c2..624f0467 100644 --- a/kmix/core/MediaController.cpp +++ b/kmix/core/MediaController.cpp @@ -29,9 +29,6 @@ #include "core/MediaController.h" -//#include -//#include - #include MediaController::MediaController(QString controlId) : @@ -40,28 +37,6 @@ MediaController::MediaController(QString controlId) : mediaPlayControl = false; mediaNextControl = false; mediaPrevControl = false; - - /* - { - // Phonon connection test code - QList devs = Phonon::BackendCapabilities::availableAudioOutputDevices(); - - if (devs.isEmpty()) - return; - - Phonon::AudioOutputDevice& dev = devs[0]; - - QList props = dev.propertyNames(); - kDebug() << "desc=" << dev.description() << ", name=" << dev.name() << ", props="; - QByteArray prop; - int i=0; - foreach (prop, props) - { - kDebug() << "#" << i << ": "<< prop; - ++i; - } - } - */ } MediaController::~MediaController() diff --git a/kmix/gui/kmixdockwidget.cpp b/kmix/gui/kmixdockwidget.cpp index a52ce1d3..b8853721 100644 --- a/kmix/gui/kmixdockwidget.cpp +++ b/kmix/gui/kmixdockwidget.cpp @@ -152,7 +152,7 @@ void KMixDockWidget::createMenuActions() connect(action, SIGNAL(triggered(bool)), _kmixMainWindow, SLOT(slotSelectMaster())); menu->addAction( action ); - //Context menu entry to access phonon settings + //Context menu entry to access media settings menu->addAction(_kmixMainWindow->actionCollection()->action("launch_kdesoundsetup")); } diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt index 1aacba10..54740557 100644 --- a/krfb/CMakeLists.txt +++ b/krfb/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories( if(Q_WS_X11) if(NOT X11_XTest_FOUND) - message(FATAL_ERROR "krfb requires the libXtst (http://xorg.freedesktop.org) to be built") + message(FATAL_ERROR "krfb requires the libXTest (http://xorg.freedesktop.org) to be built") endif(NOT X11_XTest_FOUND) endif(Q_WS_X11) diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt index d8bff516..da6e070e 100644 --- a/kvkbd/src/CMakeLists.txt +++ b/kvkbd/src/CMakeLists.txt @@ -1,6 +1,6 @@ include(${QT_USE_FILE}) -include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ) +include_directories(${KDE4_INCLUDES} ${QT_INCLUDES}) set(kvkbd_SRCS vkeyboard.cpp x11keyboard.cpp @@ -14,14 +14,9 @@ set(kvkbd_SRCS vkeyboard.cpp kvkbdapp.cpp kbdtray.cpp themeloader.cpp - ) +) - - -SET(kvkbd_RESOURCES resources.qrc) - - -QT4_ADD_RESOURCES(kvkbd_RESOURCES_RCC ${kvkbd_RESOURCES}) +QT4_ADD_RESOURCES(kvkbd_RESOURCES_RCC resources.qrc) QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Kvkbd.xml mainwidget.h MainWidget) @@ -31,9 +26,15 @@ QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Dock.xml add_executable(kvkbd ${kvkbd_SRCS} ${kvkbd_RC_SRCS} ${kvkbd_RESOURCES_RCC}) -target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} X11 Xtst) - +target_link_libraries(kvkbd + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTDBUS_LIBRARY} + ${QT_QTXML_LIBRARY} + ${X11_X11_LIB} + ${X11_XTest_LIB} +) install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( FILES kvkbd.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} ) +install(FILES kvkbd.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) -- 2.11.0