From f58a4c5452b5c80704d8d3a678d45602eb9eb6e5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 2 Sep 2015 02:13:50 +0300 Subject: [PATCH] generic: major build system cleanup --- about-distro/src/CMakeLists.txt | 3 +- akregator/configuration/CMakeLists.txt | 54 +-- akregator/export/CMakeLists.txt | 20 +- akregator/interfaces/CMakeLists.txt | 18 +- akregator/plugins/sharemicroblog/CMakeLists.txt | 35 +- akregator/src/CMakeLists.txt | 149 ++++---- amarok/shared/CMakeLists.txt | 2 +- amarok/src/CMakeLists.txt | 62 +-- .../aboutdialog/libattica-ocsclient/CMakeLists.txt | 2 +- .../context/applets/currenttrack/CMakeLists.txt | 12 +- amarok/src/context/applets/labels/CMakeLists.txt | 13 +- amarok/src/context/applets/lyrics/CMakeLists.txt | 8 +- amarok/src/context/applets/photos/CMakeLists.txt | 11 +- amarok/src/context/applets/tabs/CMakeLists.txt | 4 +- .../src/context/applets/wikipedia/CMakeLists.txt | 7 +- amarok/src/context/tools/CMakeLists.txt | 2 +- .../core-impl/collections/audiocd/CMakeLists.txt | 3 +- .../core-impl/collections/db/sql/CMakeLists.txt | 2 +- .../collections/umscollection/CMakeLists.txt | 12 +- amarok/src/core/CMakeLists.txt | 2 +- amarok/src/importers/amarok/CMakeLists.txt | 3 +- amarok/src/services/amazon/CMakeLists.txt | 6 +- amarok/src/services/ampache/CMakeLists.txt | 16 +- amarok/src/services/lastfm/CMakeLists.txt | 2 +- amarok/src/services/magnatune/CMakeLists.txt | 18 +- amarok/src/services/mp3tunes/CMakeLists.txt | 2 +- amarok/src/services/opmldirectory/CMakeLists.txt | 3 +- amarok/src/transcoding/CMakeLists.txt | 9 +- ark/app/CMakeLists.txt | 5 +- ark/kerfuffle/CMakeLists.txt | 22 +- ark/kerfuffle/tests/CMakeLists.txt | 2 +- ark/part/CMakeLists.txt | 18 +- ark/plugins/clirarplugin/CMakeLists.txt | 4 +- .../src/daemon/helpers/authorize/CMakeLists.txt | 2 +- .../helpers/confirmmodechange/CMakeLists.txt | 2 +- .../helpers/requestconfirmation/CMakeLists.txt | 2 +- .../src/daemon/helpers/requestpin/CMakeLists.txt | 6 +- bluedevil/src/kcmodule/CMakeLists.txt | 5 +- bluedevil/src/monolithic/CMakeLists.txt | 2 +- bluedevil/src/sendfile/CMakeLists.txt | 5 +- bluedevil/src/wizard/CMakeLists.txt | 18 +- dragon/src/app/CMakeLists.txt | 10 +- ffmpegthumbs/tests/CMakeLists.txt | 2 +- filelight/src/app/CMakeLists.txt | 4 +- filelight/src/part/CMakeLists.txt | 20 +- filelight/src/part/radialMap/CMakeLists.txt | 2 +- gwenview/CMakeLists.txt | 4 +- gwenview/app/CMakeLists.txt | 62 ++- gwenview/importer/CMakeLists.txt | 20 +- gwenview/lib/CMakeLists.txt | 31 +- gwenview/tests/manual/CMakeLists.txt | 6 +- jovie/filters/CMakeLists.txt | 10 +- jovie/filters/stringreplacer/CMakeLists.txt | 31 +- jovie/filters/talkerchooser/CMakeLists.txt | 10 +- jovie/filters/xmltransformer/CMakeLists.txt | 11 +- jovie/jovie/CMakeLists.txt | 2 +- jovie/kcmkttsmgr/CMakeLists.txt | 10 +- jovie/libkttsd/CMakeLists.txt | 2 +- kcalc/CMakeLists.txt | 33 +- kcalc/ChangeLog | 381 ------------------- kcalc/knumber/CMakeLists.txt | 5 +- kcharselect/CMakeLists.txt | 4 +- kcolorchooser/CMakeLists.txt | 14 +- .../samba/filepropertiesplugin/CMakeLists.txt | 10 +- kdeplasma-addons/applets/bball/CMakeLists.txt | 4 +- .../applets/binary-clock/CMakeLists.txt | 3 +- .../applets/bubblemon/src/CMakeLists.txt | 4 +- kdeplasma-addons/applets/comic/CMakeLists.txt | 11 +- .../applets/fifteenPuzzle/CMakeLists.txt | 4 +- .../applets/fileWatcher/CMakeLists.txt | 8 +- kdeplasma-addons/applets/frame/CMakeLists.txt | 8 +- .../applets/fuzzy-clock/CMakeLists.txt | 3 +- kdeplasma-addons/applets/icontasks/CMakeLists.txt | 33 +- .../applets/incomingmsg/CMakeLists.txt | 5 +- kdeplasma-addons/applets/incomingmsg/ChangeLog | 4 - .../applets/kimpanel/src/CMakeLists.txt | 2 +- .../applets/lancelot/application/CMakeLists.txt | 8 +- .../application/{ui => }/LancelotConfigBase.ui | 0 .../application/{ui => }/LancelotWindowBase.xml | 0 .../applets/lancelot/launcher/CMakeLists.txt | 10 +- .../applets/lancelot/parts/CMakeLists.txt | 4 - kdeplasma-addons/applets/leavenote/CMakeLists.txt | 5 +- kdeplasma-addons/applets/leavenote/ChangeLog | 2 - kdeplasma-addons/applets/life/CMakeLists.txt | 4 +- kdeplasma-addons/applets/luna/CMakeLists.txt | 6 +- kdeplasma-addons/applets/microblog/CMakeLists.txt | 5 +- kdeplasma-addons/applets/news/CMakeLists.txt | 12 +- kdeplasma-addons/applets/notes/CMakeLists.txt | 3 +- kdeplasma-addons/applets/paste/CMakeLists.txt | 3 - kdeplasma-addons/applets/pastebin/CMakeLists.txt | 6 +- .../applets/plasmaboard/CMakeLists.txt | 31 +- .../applets/rememberthemilk/CMakeLists.txt | 35 +- kdeplasma-addons/applets/rssnow/CMakeLists.txt | 12 +- .../applets/systemloadviewer/CMakeLists.txt | 18 +- kdeplasma-addons/applets/timer/CMakeLists.txt | 9 +- .../applets/weatherstation/CMakeLists.txt | 3 - kdeplasma-addons/applets/webslice/CMakeLists.txt | 4 +- .../applets/webslice/plasma/CMakeLists.txt | 9 +- .../groupingdesktop/lib/CMakeLists.txt | 43 +-- kdeplasma-addons/dataengines/comic/CMakeLists.txt | 2 +- kdeplasma-addons/dataengines/potd/CMakeLists.txt | 2 +- .../libs/lancelot-datamodels/CMakeLists.txt | 2 +- kdeplasma-addons/libs/lancelot/CMakeLists.txt | 2 +- kdeplasma-addons/libs/plasmaweather/CMakeLists.txt | 7 +- kdeplasma-addons/libs/rtm/CMakeLists.txt | 2 +- kdeplasma-addons/libs/rtm/tests/CMakeLists.txt | 4 +- .../runners/audioplayercontrol/CMakeLists.txt | 2 +- kdeplasma-addons/runners/characters/CMakeLists.txt | 7 +- .../runners/spellchecker/CMakeLists.txt | 2 +- kdeplasma-addons/wallpapers/pattern/CMakeLists.txt | 3 +- kdeplasma-addons/wallpapers/potd/CMakeLists.txt | 2 +- .../wallpapers/qmlwallpapers/CMakeLists.txt | 4 +- kdeplasma-addons/wallpapers/virus/CMakeLists.txt | 2 +- kdeplasma-addons/wallpapers/weather/CMakeLists.txt | 3 +- kdevelop/app/CMakeLists.txt | 2 +- kdevelop/languages/cpp/cppduchain/CMakeLists.txt | 2 +- kdevelop/languages/cpp/parser/CMakeLists.txt | 2 +- .../languages/cpp/parser/headergen/CMakeLists.txt | 2 +- kdevelop/languages/cpp/parser/rpp/CMakeLists.txt | 2 +- .../languages/cpp/parser/rpp/tests/CMakeLists.txt | 2 +- kdevelop/languages/cpp/tests/CMakeLists.txt | 2 +- .../compilerprovider/CMakeLists.txt | 2 +- kdevelop/projectmanagers/cmake/CMakeLists.txt | 2 +- .../projectmanagers/cmake/tests/CMakeLists.txt | 2 +- .../cmake/tests/manual/kde4app/CMakeLists.txt | 2 +- .../custom-buildsystem/tests/CMakeLists.txt | 2 +- kdevplatform/debugger/CMakeLists.txt | 2 +- kdevplatform/documentation/CMakeLists.txt | 4 +- kdevplatform/interfaces/CMakeLists.txt | 6 +- kdevplatform/language/CMakeLists.txt | 17 +- kdevplatform/outputview/CMakeLists.txt | 6 +- kdevplatform/plugins/appwizard/CMakeLists.txt | 5 - kdevplatform/plugins/codeutils/CMakeLists.txt | 4 +- kdevplatform/plugins/cvs/CMakeLists.txt | 9 +- kdevplatform/plugins/dashboard/CMakeLists.txt | 6 +- .../plugins/dashboard/declarative/CMakeLists.txt | 2 +- .../plasmoids/projectfileplasmoid/CMakeLists.txt | 4 +- kdevplatform/plugins/execute/CMakeLists.txt | 7 +- kdevplatform/plugins/executescript/CMakeLists.txt | 6 +- kdevplatform/plugins/externalscript/CMakeLists.txt | 5 - kdevplatform/plugins/filetemplates/CMakeLists.txt | 16 +- .../filetemplates/{ui => }/licensechooser.ui | 0 .../plugins/filetemplates/{ui => }/newclass.ui | 0 .../filetemplates/{ui => }/outputlocation.ui | 0 .../filetemplates/{ui => }/overridevirtuals.ui | 0 .../filetemplates/{ui => }/templateselection.ui | 0 .../plugins/filetemplates/{ui => }/testcases.ui | 0 .../plugins/genericprojectmanager/CMakeLists.txt | 4 +- kdevplatform/plugins/git/CMakeLists.txt | 6 +- kdevplatform/plugins/git/tests/CMakeLists.txt | 4 +- kdevplatform/plugins/grepview/CMakeLists.txt | 9 +- kdevplatform/plugins/patchreview/CMakeLists.txt | 5 +- .../plugins/patchreview/libdiff2/CMakeLists.txt | 4 +- kdevplatform/plugins/projectfilter/CMakeLists.txt | 8 +- .../plugins/projectmanagerview/CMakeLists.txt | 4 +- kdevplatform/plugins/quickopen/CMakeLists.txt | 9 +- .../plugins/quickopen/tests/CMakeLists.txt | 2 +- kdevplatform/plugins/reviewboard/CMakeLists.txt | 6 +- .../plugins/reviewboard/tests/CMakeLists.txt | 2 +- kdevplatform/plugins/snippet/CMakeLists.txt | 3 - .../plugins/standardoutputview/CMakeLists.txt | 4 +- kdevplatform/plugins/subversion/CMakeLists.txt | 14 +- .../plugins/subversion/{ui => }/blameoptiondlg.ui | 0 .../plugins/subversion/{ui => }/catoptiondlg.ui | 0 .../subversion/{ui => }/checkoutmetadatawidget.ui | 0 .../subversion/{ui => }/commitloginputdlg.ui | 0 .../plugins/subversion/{ui => }/copyoptiondlg.ui | 0 .../plugins/subversion/{ui => }/diffoptiondlg.ui | 0 .../subversion/{ui => }/importmetadatawidget.ui | 0 .../subversion/{ui => }/logviewoptiondlg.ui | 0 .../plugins/subversion/{ui => }/moveoptiondlg.ui | 0 .../plugins/subversion/{ui => }/revertoptiondlg.ui | 0 .../plugins/subversion/{ui => }/revisionwidget.ui | 0 .../plugins/subversion/{ui => }/ssltrustdialog.ui | 0 .../plugins/subversion/{ui => }/statusoptiondlg.ui | 0 .../plugins/subversion/{ui => }/updateoptiondlg.ui | 0 .../plugins/templatemanager/CMakeLists.txt | 4 +- kdevplatform/project/CMakeLists.txt | 6 +- kdevplatform/project/tests/CMakeLists.txt | 2 +- kdevplatform/shell/CMakeLists.txt | 19 +- kdevplatform/shell/settings/CMakeLists.txt | 24 -- kdevplatform/sublime/CMakeLists.txt | 6 +- kdevplatform/sublime/examples/CMakeLists.txt | 4 +- kdevplatform/tests/CMakeLists.txt | 2 +- kdevplatform/tests/json/CMakeLists.txt | 2 +- kdevplatform/util/CMakeLists.txt | 16 +- .../util/dbus_socket_transformer/CMakeLists.txt | 2 +- kdevplatform/util/duchainify/CMakeLists.txt | 2 +- kdevplatform/util/ssh_client/CMakeLists.txt | 2 +- kdevplatform/vcs/CMakeLists.txt | 24 +- kfilemetadata/CMakeLists.txt | 4 +- kfilemetadata/src/CMakeLists.txt | 2 +- kfloppy/CMakeLists.txt | 2 +- kget/CMakeLists.txt | 10 +- kget/transfer-plugins/bittorrent/CMakeLists.txt | 10 +- .../transfer-plugins/checksumsearch/CMakeLists.txt | 11 +- kget/transfer-plugins/metalink/CMakeLists.txt | 22 +- kget/transfer-plugins/mirrorsearch/CMakeLists.txt | 15 +- .../multisegmentkio/CMakeLists.txt | 3 - kgpg/CMakeLists.txt | 69 ++-- kmix/CMakeLists.txt | 4 +- kmix/tests/CMakeLists.txt | 4 +- kolourpaint/CMakeLists.txt | 293 +++++++------- kolourpaint/ChangeLog | 15 - kompare/CMakeLists.txt | 4 +- kompare/ChangeLog | 423 --------------------- kompare/interfaces/CMakeLists.txt | 2 +- kompare/komparepart/CMakeLists.txt | 7 +- kompare/libdialogpages/CMakeLists.txt | 2 +- kompare/libkomparediff2/CMakeLists.txt | 35 +- krdc/CMakeLists.txt | 9 +- krdc/core/CMakeLists.txt | 2 +- krdc/krdc_approver/CMakeLists.txt | 2 +- krdc/rdp/CMakeLists.txt | 3 - krdc/vnc/CMakeLists.txt | 3 - krfb/krfb/CMakeLists.txt | 52 +-- krfb/krfb/{ui => }/configsecurity.ui | 0 krfb/krfb/{ui => }/configtcp.ui | 0 krfb/krfb/{ui => }/connectionwidget.ui | 0 krfb/krfb/{ui => }/invitewidget.ui | 0 krfb/krfb/{ui => }/mainwidget.ui | 0 krfb/krfb/{ui => }/tubesconnectionwidget.ui | 0 ksnapshot/CMakeLists.txt | 16 +- ksystemlog/CMakeLists.txt | 8 +- ksystemlog/Changelog | 217 ----------- ksystemlog/src/CMakeLists.txt | 104 +++-- ksystemlog/src/config/CMakeLists.txt | 2 +- ksystemlog/src/lib/CMakeLists.txt | 6 +- ksystemlog/src/modes/acpid/CMakeLists.txt | 2 +- ksystemlog/src/modes/apache/CMakeLists.txt | 2 +- ksystemlog/src/modes/authentication/CMakeLists.txt | 2 +- ksystemlog/src/modes/base/CMakeLists.txt | 10 +- ksystemlog/src/modes/cron/CMakeLists.txt | 2 +- ksystemlog/src/modes/cups/CMakeLists.txt | 2 +- ksystemlog/src/modes/daemon/CMakeLists.txt | 2 +- ksystemlog/src/modes/kernel/CMakeLists.txt | 2 +- ksystemlog/src/modes/open/CMakeLists.txt | 2 +- ksystemlog/src/modes/postfix/CMakeLists.txt | 2 +- ksystemlog/src/modes/samba/CMakeLists.txt | 2 +- ksystemlog/src/modes/system/CMakeLists.txt | 2 +- ksystemlog/src/modes/xorg/CMakeLists.txt | 2 +- ksystemlog/src/modes/xsession/CMakeLists.txt | 5 +- ktimer/CMakeLists.txt | 8 +- kuser/CMakeLists.txt | 7 +- kuser/ChangeLog | 47 --- kvkbd/src/CMakeLists.txt | 2 +- libksane/libksane/CMakeLists.txt | 4 +- libkscreen/CMakeLists.txt | 4 +- libktorrent/examples/ktcli/CMakeLists.txt | 2 +- libktorrent/src/CMakeLists.txt | 2 +- libktorrent/src/datachecker/CMakeLists.txt | 19 +- libktorrent/src/dht/CMakeLists.txt | 60 +-- libktorrent/src/diskio/CMakeLists.txt | 28 +- libktorrent/src/download/CMakeLists.txt | 23 +- libktorrent/src/magnet/CMakeLists.txt | 10 +- libktorrent/src/mse/CMakeLists.txt | 16 +- libktorrent/src/net/CMakeLists.txt | 43 ++- libktorrent/src/peer/CMakeLists.txt | 40 +- libktorrent/src/torrent/CMakeLists.txt | 38 +- libktorrent/src/util/CMakeLists.txt | 56 +-- libktorrent/src/utp/CMakeLists.txt | 30 +- libktorrent/testlib/CMakeLists.txt | 2 +- lokalize/src/CMakeLists.txt | 7 +- okular/CMakeLists.txt | 18 +- okular/generators/kimgio/CMakeLists.txt | 22 +- okular/generators/poppler/CMakeLists.txt | 3 - okular/generators/spectre/CMakeLists.txt | 3 - okular/plasma/components/CMakeLists.txt | 2 +- okular/shell/CMakeLists.txt | 4 +- partitionmanager/src/CMakeLists.txt | 8 +- plasma-nm/editor/CMakeLists.txt | 13 +- plasma-nm/editor/{ui => }/connectioneditor.ui | 0 plasma-nm/kded/CMakeLists.txt | 4 - plasma-nm/libs/CMakeLists.txt | 2 +- plasma-nm/libs/declarative/CMakeLists.txt | 2 +- plasma-nm/libs/editor/CMakeLists.txt | 19 +- plasma-nm/settings/details/CMakeLists.txt | 3 - plasma-nm/vpn/l2tp/CMakeLists.txt | 6 +- plasma-nm/vpn/openswan/CMakeLists.txt | 4 +- plasma-nm/vpn/openvpn/CMakeLists.txt | 5 +- plasma-nm/vpn/pptp/CMakeLists.txt | 13 +- plasma-nm/vpn/strongswan/CMakeLists.txt | 12 +- plasma-nm/vpn/vpnc/CMakeLists.txt | 5 +- print-manager/add-printer/CMakeLists.txt | 5 +- print-manager/configure-printer/CMakeLists.txt | 5 +- print-manager/declarative-plugins/CMakeLists.txt | 2 +- print-manager/libkcups/CMakeLists.txt | 5 +- print-manager/printer-manager-kcm/CMakeLists.txt | 3 - print-manager/printqueue/CMakeLists.txt | 5 +- skanlite/src/CMakeLists.txt | 16 +- syndication/CMakeLists.txt | 6 +- syndication/tests/CMakeLists.txt | 4 +- thumbnailers/po/CMakeLists.txt | 4 +- yakuake/app/CMakeLists.txt | 10 +- 294 files changed, 1334 insertions(+), 2673 deletions(-) delete mode 100644 kcalc/ChangeLog delete mode 100644 kdeplasma-addons/applets/incomingmsg/ChangeLog rename kdeplasma-addons/applets/lancelot/application/{ui => }/LancelotConfigBase.ui (100%) rename kdeplasma-addons/applets/lancelot/application/{ui => }/LancelotWindowBase.xml (100%) delete mode 100644 kdeplasma-addons/applets/leavenote/ChangeLog rename kdevplatform/plugins/filetemplates/{ui => }/licensechooser.ui (100%) rename kdevplatform/plugins/filetemplates/{ui => }/newclass.ui (100%) rename kdevplatform/plugins/filetemplates/{ui => }/outputlocation.ui (100%) rename kdevplatform/plugins/filetemplates/{ui => }/overridevirtuals.ui (100%) rename kdevplatform/plugins/filetemplates/{ui => }/templateselection.ui (100%) rename kdevplatform/plugins/filetemplates/{ui => }/testcases.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/blameoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/catoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/checkoutmetadatawidget.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/commitloginputdlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/copyoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/diffoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/importmetadatawidget.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/logviewoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/moveoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/revertoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/revisionwidget.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/ssltrustdialog.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/statusoptiondlg.ui (100%) rename kdevplatform/plugins/subversion/{ui => }/updateoptiondlg.ui (100%) delete mode 100644 kolourpaint/ChangeLog delete mode 100644 kompare/ChangeLog rename krfb/krfb/{ui => }/configsecurity.ui (100%) rename krfb/krfb/{ui => }/configtcp.ui (100%) rename krfb/krfb/{ui => }/connectionwidget.ui (100%) rename krfb/krfb/{ui => }/invitewidget.ui (100%) rename krfb/krfb/{ui => }/mainwidget.ui (100%) rename krfb/krfb/{ui => }/tubesconnectionwidget.ui (100%) delete mode 100644 ksystemlog/Changelog delete mode 100644 kuser/ChangeLog rename plasma-nm/editor/{ui => }/connectioneditor.ui (100%) diff --git a/about-distro/src/CMakeLists.txt b/about-distro/src/CMakeLists.txt index 5f11201f..731d4c3c 100644 --- a/about-distro/src/CMakeLists.txt +++ b/about-distro/src/CMakeLists.txt @@ -4,10 +4,9 @@ set(kcm_SRCS main.cpp Module.cpp OSRelease.cpp + Module.ui ) -kde4_add_ui_files(kcm_SRCS Module.ui) - kde4_add_plugin(kcm_about_distro ${kcm_SRCS}) target_link_libraries(kcm_about_distro diff --git a/akregator/configuration/CMakeLists.txt b/akregator/configuration/CMakeLists.txt index 0f54d048..20097f45 100644 --- a/akregator/configuration/CMakeLists.txt +++ b/akregator/configuration/CMakeLists.txt @@ -1,19 +1,21 @@ include_directories( - ${PROJECT_BINARY_DIR}/interfaces - ${PROJECT_SOURCE_DIR}/interfaces + ${PROJECT_BINARY_DIR}/interfaces + ${PROJECT_SOURCE_DIR}/interfaces ) ########### next target ############### -set(kcm_akrgeneralconfig_SRCS akregator_config_general.cpp) +set(kcm_akrgeneralconfig_SRCS + akregator_config_general.cpp + settings_general.ui +) -kde4_add_ui_files(kcm_akrgeneralconfig_SRCS settings_general.ui) kde4_add_plugin(akregator_config_general ${kcm_akrgeneralconfig_SRCS}) target_link_libraries(akregator_config_general - akregatorinterfaces - ${KDE4_KIO_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} ) install(FILES akregator_config_general.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -21,14 +23,16 @@ install(TARGETS akregator_config_general DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### -set(kcm_akrappearanceconfig_SRCS akregator_config_appearance.cpp) +set(kcm_akrappearanceconfig_SRCS + akregator_config_appearance.cpp + settings_appearance.ui +) -kde4_add_ui_files(kcm_akrappearanceconfig_SRCS settings_appearance.ui) kde4_add_plugin(akregator_config_appearance ${kcm_akrappearanceconfig_SRCS}) target_link_libraries(akregator_config_appearance - akregatorinterfaces - ${KDE4_KIO_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} ) install(FILES akregator_config_appearance.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -36,14 +40,16 @@ install(TARGETS akregator_config_appearance DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### -set(kcm_akrarchiveconfig_SRCS akregator_config_archive.cpp) +set(kcm_akrarchiveconfig_SRCS + akregator_config_archive.cpp + settings_archive.ui +) -kde4_add_ui_files(kcm_akrarchiveconfig_SRCS settings_archive.ui) kde4_add_plugin(akregator_config_archive ${kcm_akrarchiveconfig_SRCS}) target_link_libraries(akregator_config_archive - akregatorinterfaces - ${KDE4_KIO_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} ) install(FILES akregator_config_archive.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -51,14 +57,16 @@ install(TARGETS akregator_config_archive DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### -set(kcm_akrbrowserconfig_SRCS akregator_config_browser.cpp) +set(kcm_akrbrowserconfig_SRCS + akregator_config_browser.cpp + settings_browser.ui +) -kde4_add_ui_files(kcm_akrbrowserconfig_SRCS settings_browser.ui) kde4_add_plugin(akregator_config_browser ${kcm_akrbrowserconfig_SRCS}) target_link_libraries(akregator_config_browser - akregatorinterfaces - ${KDE4_KIO_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} ) install(FILES akregator_config_browser.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -67,16 +75,16 @@ install(TARGETS akregator_config_browser DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### set(kcm_akradvancedconfig_SRCS - akregator_config_advanced.cpp - settings_advanced.cpp + akregator_config_advanced.cpp + settings_advanced.cpp + settings_advancedbase.ui ) -kde4_add_ui_files(kcm_akradvancedconfig_SRCS settings_advancedbase.ui) kde4_add_plugin(akregator_config_advanced ${kcm_akradvancedconfig_SRCS}) target_link_libraries(akregator_config_advanced - akregatorinterfaces - ${KDE4_KIO_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} ) install(FILES akregator_config_advanced.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/akregator/export/CMakeLists.txt b/akregator/export/CMakeLists.txt index b24f79c2..cd7ca683 100644 --- a/akregator/export/CMakeLists.txt +++ b/akregator/export/CMakeLists.txt @@ -1,20 +1,20 @@ include_directories( - ${CMAKE_SOURCE_DIR}/akregator/interfaces - ${CMAKE_SOURCE_DIR} - ${KDE4_INCLUDE_DIR} - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/akregator/interfaces + ${CMAKE_SOURCE_DIR} + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) set(akregatorstorageexporter_SRCS akregatorstorageexporter.cpp) -kde4_add_executable(akregatorstorageexporter NOGUI ${akregatorstorageexporter_SRCS}) +add_executable(akregatorstorageexporter ${akregatorstorageexporter_SRCS}) target_link_libraries(akregatorstorageexporter - ${KDE4_KDECORE_LIBS} - syndication - akregatorinterfaces + ${KDE4_KDECORE_LIBS} + syndication + akregatorinterfaces ) install(TARGETS akregatorstorageexporter ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/akregator/interfaces/CMakeLists.txt b/akregator/interfaces/CMakeLists.txt index 09973194..6287f8b3 100644 --- a/akregator/interfaces/CMakeLists.txt +++ b/akregator/interfaces/CMakeLists.txt @@ -1,22 +1,24 @@ ########### next target ############### set(akregatorinterfaces_LIB_SRCS - command.cpp - feedlistmanagementinterface.cpp - plugin.cpp - storagefactoryregistry.cpp + command.cpp + feedlistmanagementinterface.cpp + plugin.cpp + storagefactoryregistry.cpp ) kde4_add_kcfg_files(akregatorinterfaces_LIB_SRCS akregatorconfig.kcfgc) -kde4_add_library(akregatorinterfaces ${LIBRARY_TYPE} ${akregatorinterfaces_LIB_SRCS}) +add_library(akregatorinterfaces ${LIBRARY_TYPE} ${akregatorinterfaces_LIB_SRCS}) target_link_libraries(akregatorinterfaces - ${KDE4_KDEUI_LIBS} - syndication + ${KDE4_KDEUI_LIBS} + syndication ) -set_target_properties(akregatorinterfaces PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} +set_target_properties(akregatorinterfaces PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS akregatorinterfaces ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/akregator/plugins/sharemicroblog/CMakeLists.txt b/akregator/plugins/sharemicroblog/CMakeLists.txt index 93e9bc97..34257035 100644 --- a/akregator/plugins/sharemicroblog/CMakeLists.txt +++ b/akregator/plugins/sharemicroblog/CMakeLists.txt @@ -1,11 +1,11 @@ include_directories( - ${CMAKE_SOURCE_DIR}/akregator/interfaces - ${CMAKE_SOURCE_DIR}/akregator/src - ${CMAKE_SOURCE_DIR} - ${KDE4_INCLUDE_DIR} - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/akregator/interfaces + ${CMAKE_SOURCE_DIR}/akregator/src + ${CMAKE_SOURCE_DIR} + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) set(akregator_sharemicroblog_plugin_SRCS sharemicroblogplugin.cpp) @@ -13,11 +13,11 @@ set(akregator_sharemicroblog_plugin_SRCS sharemicroblogplugin.cpp) kde4_add_plugin(akregator_sharemicroblog_plugin ${akregator_sharemicroblog_plugin_SRCS}) target_link_libraries(akregator_sharemicroblog_plugin - akregatorprivate - akregatorinterfaces - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KPARTS_LIBS} + akregatorprivate + akregatorinterfaces + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${KDE4_KPARTS_LIBS} ) install(FILES akregator_sharemicroblog_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -27,17 +27,18 @@ install(FILES akregator_sharemicroblog_plugin.rc DESTINATION ${DATA_INSTALL_DIR} ########### settings target ############### set(kcm_akrshareconfig_SRCS - akregator_config_sharemicroblog.cpp + akregator_config_sharemicroblog.cpp + configurationwidget.ui ) kde4_add_kcfg_files(kcm_akrshareconfig_SRCS sharesettings.kcfgc) -kde4_add_ui_files(kcm_akrshareconfig_SRCS configurationwidget.ui) + kde4_add_plugin(akregator_config_sharemicroblog ${kcm_akrshareconfig_SRCS}) target_link_libraries(akregator_config_sharemicroblog - akregatorinterfaces - ${KDE4_KIO_LIBS} - ${KDE4_KPARTS_LIBS} + akregatorinterfaces + ${KDE4_KIO_LIBS} + ${KDE4_KPARTS_LIBS} ) install(FILES akregator_config_sharemicroblog.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index 7d9d6741..b2bbc56a 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -12,14 +12,12 @@ include_directories( set(akregator_SRCS main.cpp mainwindow.cpp) -kde4_add_app_icon(akregator_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akregator.png") - -kde4_add_executable(akregator ${akregator_SRCS}) +add_executable(akregator ${akregator_SRCS}) target_link_libraries(akregator - ${KDE4_KPARTS_LIBS} - akregatorprivate - akregatorinterfaces + ${KDE4_KPARTS_LIBS} + akregatorprivate + akregatorinterfaces ) install(TARGETS akregator ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -27,101 +25,98 @@ install(TARGETS akregator ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### set(akregatorprivate_LIB_SRCS - aboutdata.cpp - trayicon.cpp - article.cpp - feed.cpp - feedlist.cpp - treenode.cpp - treenodevisitor.cpp - utils.cpp - feediconmanager.cpp - notificationmanager.cpp - articlejobs.cpp - folder.cpp - kernel.cpp - subscriptionlistjobs.cpp - fetchqueue.cpp - frame.cpp - framemanager.cpp - browserrun.cpp - openurlrequest.cpp - actionmanager.cpp - actions.cpp + aboutdata.cpp + trayicon.cpp + article.cpp + feed.cpp + feedlist.cpp + treenode.cpp + treenodevisitor.cpp + utils.cpp + feediconmanager.cpp + notificationmanager.cpp + articlejobs.cpp + folder.cpp + kernel.cpp + subscriptionlistjobs.cpp + fetchqueue.cpp + frame.cpp + framemanager.cpp + browserrun.cpp + openurlrequest.cpp + actionmanager.cpp + actions.cpp ) -kde4_add_library(akregatorprivate ${LIBRARY_TYPE} ${akregatorprivate_LIB_SRCS}) +add_library(akregatorprivate ${LIBRARY_TYPE} ${akregatorprivate_LIB_SRCS}) target_link_libraries(akregatorprivate - ${KDE4_KDEUI_LIBS} - ${KDE4_KPARTS_LIBS} - akregatorinterfaces - syndication + ${KDE4_KDEUI_LIBS} + ${KDE4_KPARTS_LIBS} + akregatorinterfaces + syndication ) set_target_properties(akregatorprivate - PROPERTIES VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} + PROPERTIES VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS akregatorprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) ########### next target ############### set(akregator_utils_SRCS - utils/filtercolumnsproxymodel.cpp + utils/filtercolumnsproxymodel.cpp ) set(akregatorpart_PART_SRCS - ${akregator_utils_SRCS} - deletesubscriptioncommand.cpp - abstractselectioncontroller.cpp - articlematcher.cpp - articlemodel.cpp - pluginmanager.cpp - selectioncontroller.cpp - subscriptionlistmodel.cpp - searchbar.cpp - articlelistview.cpp - actionmanagerimpl.cpp - createfeedcommand.cpp - createfoldercommand.cpp - expireitemscommand.cpp - articleviewer.cpp - articleformatter.cpp - addfeeddialog.cpp - loadfeedlistcommand.cpp - editsubscriptioncommand.cpp - importfeedlistcommand.cpp - feedpropertiesdialog.cpp - tabwidget.cpp - akregator_part.cpp - mainwidget.cpp - subscriptionlistview.cpp - subscriptionlistdelegate.cpp - dummystorage/storagedummyimpl.cpp - dummystorage/storagefactorydummyimpl.cpp - dummystorage/feedstoragedummyimpl.cpp - speechclient.cpp + ${akregator_utils_SRCS} + deletesubscriptioncommand.cpp + abstractselectioncontroller.cpp + articlematcher.cpp + articlemodel.cpp + pluginmanager.cpp + selectioncontroller.cpp + subscriptionlistmodel.cpp + searchbar.cpp + articlelistview.cpp + actionmanagerimpl.cpp + createfeedcommand.cpp + createfoldercommand.cpp + expireitemscommand.cpp + articleviewer.cpp + articleformatter.cpp + addfeeddialog.cpp + loadfeedlistcommand.cpp + editsubscriptioncommand.cpp + importfeedlistcommand.cpp + feedpropertiesdialog.cpp + tabwidget.cpp + akregator_part.cpp + mainwidget.cpp + subscriptionlistview.cpp + subscriptionlistdelegate.cpp + dummystorage/storagedummyimpl.cpp + dummystorage/storagefactorydummyimpl.cpp + dummystorage/feedstoragedummyimpl.cpp + speechclient.cpp + addfeedwidgetbase.ui + feedpropertieswidgetbase.ui ) qt4_add_dbus_interfaces(akregatorpart_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml) qt4_add_dbus_adaptor(akregatorpart_PART_SRCS org.kde.akregator.part.xml akregator_part.h Akregator::Part) -kde4_add_ui_files(akregatorpart_PART_SRCS - addfeedwidgetbase.ui - feedpropertieswidgetbase.ui -) - kde4_add_plugin(akregatorpart ${akregatorpart_PART_SRCS}) target_link_libraries(akregatorpart - akregatorinterfaces - akregatorprivate - ${KDE4_KCMUTILS_LIBS} - ${KDE4_KNOTIFYCONFIG_LIBS} - ${KDE4_SOLID_LIBRARY} - ${KDE4_KPARTS_LIBS} - syndication + akregatorinterfaces + akregatorprivate + ${KDE4_KCMUTILS_LIBS} + ${KDE4_KNOTIFYCONFIG_LIBS} + ${KDE4_SOLID_LIBRARY} + ${KDE4_KPARTS_LIBS} + syndication ) install(TARGETS akregatorpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/amarok/shared/CMakeLists.txt b/amarok/shared/CMakeLists.txt index 31ca0f4f..7f48a594 100644 --- a/amarok/shared/CMakeLists.txt +++ b/amarok/shared/CMakeLists.txt @@ -30,7 +30,7 @@ set( amarokshared_tag_helpers_SRCS tag_helpers/VorbisCommentTagHelper.cpp ) -kde4_add_library( amarokshared SHARED +add_library( amarokshared SHARED ${amarokshared_SRCS} ${amarokshared_collectionscanner_SRCS} ${amarokshared_tag_helpers_SRCS} ) diff --git a/amarok/src/CMakeLists.txt b/amarok/src/CMakeLists.txt index 71c9ef84..eb112ecc 100644 --- a/amarok/src/CMakeLists.txt +++ b/amarok/src/CMakeLists.txt @@ -129,9 +129,6 @@ set(libconfigdialog_SRCS configdialog/dialogs/ScriptsConfig.cpp configdialog/dialogs/ScriptSelector.cpp configdialog/dialogs/DatabaseConfig.cpp -) - -kde4_add_ui_files(libconfigdialog_SRCS configdialog/dialogs/CollectionConfig.ui configdialog/dialogs/GeneralConfig.ui configdialog/dialogs/MetadataConfig.ui @@ -388,9 +385,6 @@ set(libplaylist_SRCS playlist/proxymodels/SortFilterProxy.cpp playlist/proxymodels/SortScheme.cpp playlist/proxymodels/SearchProxy.cpp -) - -kde4_add_ui_files(libplaylist_SRCS playlist/PlaylistQueueEditor.ui ) @@ -505,9 +499,6 @@ set(apg_SRCS playlistgenerator/constraints/TagMatch.cpp playlistgenerator/constraints/TagMatchSupport.cpp playlistgenerator/constraints/TrackSpreader.cpp -) - -kde4_add_ui_files(apg_SRCS playlistgenerator/ConstraintGroupEditWidget.ui playlistgenerator/PresetEditDialog.ui playlistgenerator/constraints/CheckpointEditWidget.ui @@ -529,11 +520,8 @@ if( CMAKE_BUILD_TYPE_TOLOWER MATCHES debug ) set(network_access_SRCS ${network_access_SRCS} network/NetworkAccessViewer.cpp - ) - - kde4_add_ui_files(network_access_SRCS network/NetworkRequests.ui - ) + ) endif( CMAKE_BUILD_TYPE_TOLOWER MATCHES debug ) ##################################################################### @@ -564,9 +552,6 @@ set( statsyncing_SRCS statsyncing/ui/ConfigureProviderDialog.cpp statsyncing/ui/MatchedTracksPage.cpp statsyncing/ui/TrackDelegate.cpp -) - -kde4_add_ui_files( statsyncing_SRCS statsyncing/ui/ChooseProvidersPage.ui statsyncing/ui/MatchedTracksPage.ui ) @@ -734,6 +719,19 @@ set(amaroklib_LIB_SRCS GlobalCollectionActions.cpp GlobalCurrentTrackActions.cpp moodbar/MoodbarManager.cpp + aboutdialog/OcsPersonItem.ui + dialogs/EditFilterDialog.ui + dialogs/EqualizerDialog.ui + dialogs/MusicBrainzTagger.ui + dialogs/TagDialogBase.ui + dialogs/TagGuessOptions.ui + dialogs/OrganizeCollectionOptions.ui + dialogs/OrganizeCollectionDialogBase.ui + playlist/layouts/PlaylistLayoutEditDialog.ui + core-impl/podcasts/sql/PodcastSettingsBase.ui + core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui + core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui + browsers/playlistbrowser/PodcastCategoryBase.ui ) if( LIBMYGPO_QT_FOUND ) @@ -834,23 +832,7 @@ set( amaroklib_DEPENDS "amarok-transcoding" ) # depends on generated ui_*.h file kde4_add_kcfg_files(amaroklib_LIB_SRCS amarokconfig.kcfgc) add_custom_target(amarokconfig_h DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/amarokconfig.h) -kde4_add_ui_files(amaroklib_LIB_SRCS - aboutdialog/OcsPersonItem.ui - dialogs/EditFilterDialog.ui - dialogs/EqualizerDialog.ui - dialogs/MusicBrainzTagger.ui - dialogs/TagDialogBase.ui - dialogs/TagGuessOptions.ui - dialogs/OrganizeCollectionOptions.ui - dialogs/OrganizeCollectionDialogBase.ui - playlist/layouts/PlaylistLayoutEditDialog.ui - core-impl/podcasts/sql/PodcastSettingsBase.ui - core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui - core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui - browsers/playlistbrowser/PodcastCategoryBase.ui -) - -kde4_add_library(amaroklib SHARED ${amaroklib_LIB_SRCS} ${AMAROK_MPRIS1_ADAPTOR_SRCS}) +add_library(amaroklib SHARED ${amaroklib_LIB_SRCS} ${AMAROK_MPRIS1_ADAPTOR_SRCS}) target_link_libraries(amaroklib ${KDE4_KDEUI_LIBS} @@ -891,7 +873,7 @@ if( QCA2_FOUND ) endif( QCA2_FOUND ) -if(KDE4_BUILD_TESTS) +if(ENABLE_TESTING) target_link_libraries(amaroklib ${QT_QTTEST_LIBRARY}) endif() @@ -905,19 +887,9 @@ install(TARGETS amaroklib ${INSTALL_TARGETS_DEFAULT_ARGS} ) set( amarok_SRCS main.cpp ) -kde4_add_app_icon(amarok_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../images/hi*-app-amarok.png) - find_package(X11) -kde4_add_executable(amarok ${amarok_SRCS}) -if(APPLE) - set_target_properties(amarok PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") - set(MACOSX_BUNDLE_BUNDLE_NAME "Amarok 2") - set(MACOSX_BUNDLE_BUNDLE_VERSION "2.8.0-git") - set(MACOSX_BUNDLE_COPYRIGHT "Amarok Team") - set_target_properties(amarok PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_FILES_DIR}/Info.plist.template) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/amarok.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) -endif(APPLE) +add_executable(amarok ${amarok_SRCS}) target_link_libraries(amarok ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} amarokcore amaroklib ${X11_LIBRARIES}) install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/amarok/src/aboutdialog/libattica-ocsclient/CMakeLists.txt b/amarok/src/aboutdialog/libattica-ocsclient/CMakeLists.txt index aadfb1aa..3e12e977 100644 --- a/amarok/src/aboutdialog/libattica-ocsclient/CMakeLists.txt +++ b/amarok/src/aboutdialog/libattica-ocsclient/CMakeLists.txt @@ -34,7 +34,7 @@ set(ocsclient_SRCS -kde4_add_library(amarokocsclient SHARED ${ocsclient_SRCS}) +add_library(amarokocsclient SHARED ${ocsclient_SRCS}) set_target_properties(amarokocsclient PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) target_link_libraries(amarokocsclient ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS}) diff --git a/amarok/src/context/applets/currenttrack/CMakeLists.txt b/amarok/src/context/applets/currenttrack/CMakeLists.txt index 55ce0694..55b208b5 100644 --- a/amarok/src/context/applets/currenttrack/CMakeLists.txt +++ b/amarok/src/context/applets/currenttrack/CMakeLists.txt @@ -6,13 +6,13 @@ include_directories( ${Amarok_SOURCE_DIR}/src ) -set( currenttrack_SRCS - CurrentTrack.cpp - ${Amarok_SOURCE_DIR}/src/context/widgets/RecentlyPlayedListWidget.cpp - ${Amarok_SOURCE_DIR}/src/widgets/PixmapViewer.cpp - ) +set(currenttrack_SRCS + CurrentTrack.cpp + ${Amarok_SOURCE_DIR}/src/context/widgets/RecentlyPlayedListWidget.cpp + ${Amarok_SOURCE_DIR}/src/widgets/PixmapViewer.cpp + currentTrackSettings.ui +) -kde4_add_ui_files( currenttrack_SRCS currentTrackSettings.ui ) kde4_add_plugin(amarok_context_applet_currenttrack ${currenttrack_SRCS}) if(APPLE) SET_TARGET_PROPERTIES(amarok_context_applet_currenttrack PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") diff --git a/amarok/src/context/applets/labels/CMakeLists.txt b/amarok/src/context/applets/labels/CMakeLists.txt index f06a8fcf..de3fe021 100644 --- a/amarok/src/context/applets/labels/CMakeLists.txt +++ b/amarok/src/context/applets/labels/CMakeLists.txt @@ -1,15 +1,18 @@ project(context-labels) -set(labels_SRCS LabelsApplet.cpp LabelGraphicsItem.cpp LabelOverlayButton.cpp) +set(labels_SRCS + LabelsApplet.cpp + LabelGraphicsItem.cpp + LabelOverlayButton.cpp + labelsGeneralSettings.ui + labelsBlacklistSettings.ui + labelsReplacementSettings.ui +) include_directories( ../.. ../../.. ) -kde4_add_ui_files( labels_SRCS labelsGeneralSettings.ui labelsBlacklistSettings.ui labelsReplacementSettings.ui ) kde4_add_plugin(amarok_context_applet_labels ${labels_SRCS}) -if(APPLE) - SET_TARGET_PROPERTIES(amarok_context_applet_labels PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") -endif(APPLE) target_link_libraries(amarok_context_applet_labels amarokcore amaroklib diff --git a/amarok/src/context/applets/lyrics/CMakeLists.txt b/amarok/src/context/applets/lyrics/CMakeLists.txt index b2a86d48..62f50f57 100644 --- a/amarok/src/context/applets/lyrics/CMakeLists.txt +++ b/amarok/src/context/applets/lyrics/CMakeLists.txt @@ -3,16 +3,14 @@ project(context-currenttrack) set(lyrics_SRCS LyricsApplet.cpp LyricsBrowser.cpp - LyricsSuggestionsListWidget.cpp) + LyricsSuggestionsListWidget.cpp + lyricsSettings.ui +) include_directories( ../.. ../../.. ) -kde4_add_ui_files( lyrics_SRCS lyricsSettings.ui ) kde4_add_plugin(amarok_context_applet_lyrics ${lyrics_SRCS}) -if(APPLE) - SET_TARGET_PROPERTIES(amarok_context_applet_lyrics PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") -endif(APPLE) target_link_libraries(amarok_context_applet_lyrics amarokcore amaroklib diff --git a/amarok/src/context/applets/photos/CMakeLists.txt b/amarok/src/context/applets/photos/CMakeLists.txt index 590eceae..10289356 100644 --- a/amarok/src/context/applets/photos/CMakeLists.txt +++ b/amarok/src/context/applets/photos/CMakeLists.txt @@ -3,14 +3,13 @@ include_directories( ${Amarok_SOURCE_DIR}/src/network ) -set( photos_applet_SRCS - DragPixmapItem.cpp - PhotosApplet.cpp - PhotosScrollWidget.cpp +set(photos_applet_SRCS + DragPixmapItem.cpp + PhotosApplet.cpp + PhotosScrollWidget.cpp + photosSettings.ui ) -kde4_add_ui_files( photos_applet_SRCS photosSettings.ui ) - kde4_add_plugin(amarok_context_applet_photos ${photos_applet_SRCS}) target_link_libraries( amarok_context_applet_photos amarokcore diff --git a/amarok/src/context/applets/tabs/CMakeLists.txt b/amarok/src/context/applets/tabs/CMakeLists.txt index ceebaf9d..dbc3a692 100644 --- a/amarok/src/context/applets/tabs/CMakeLists.txt +++ b/amarok/src/context/applets/tabs/CMakeLists.txt @@ -1,9 +1,7 @@ include_directories( ../.. ../../..) -set( tabs_applet_SRCS TabsApplet.cpp TabsView.cpp TabsItem.cpp ) - -kde4_add_ui_files( tabs_applet_SRCS TabsSettings.ui ReloadEditDialog.ui ) +set( tabs_applet_SRCS TabsApplet.cpp TabsView.cpp TabsItem.cpp TabsSettings.ui ReloadEditDialog.ui ) kde4_add_plugin( amarok_context_applet_tabs ${tabs_applet_SRCS} ) target_link_libraries( amarok_context_applet_tabs amarokcore diff --git a/amarok/src/context/applets/wikipedia/CMakeLists.txt b/amarok/src/context/applets/wikipedia/CMakeLists.txt index 74b851bd..a859cd90 100644 --- a/amarok/src/context/applets/wikipedia/CMakeLists.txt +++ b/amarok/src/context/applets/wikipedia/CMakeLists.txt @@ -1,18 +1,13 @@ project(context-currenttrack) -set( wiki_SRCS WikipediaApplet.cpp ) +set( wiki_SRCS WikipediaApplet.cpp wikipediaGeneralSettings.ui wikipediaLanguageSettings.ui) include_directories(${Amarok_SOURCE_DIR}/src ${Amarok_SOURCE_DIR}/src/context ${Amarok_SOURCE_DIR}/src/network ) -kde4_add_ui_files( wiki_SRCS wikipediaGeneralSettings.ui wikipediaLanguageSettings.ui ) - kde4_add_plugin(amarok_context_applet_wikipedia ${wiki_SRCS}) -if(APPLE) - SET_TARGET_PROPERTIES(amarok_context_applet_wikipedia PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") -endif(APPLE) target_link_libraries(amarok_context_applet_wikipedia amarokcore amaroklib diff --git a/amarok/src/context/tools/CMakeLists.txt b/amarok/src/context/tools/CMakeLists.txt index 2d8e0491..47250d7e 100644 --- a/amarok/src/context/tools/CMakeLists.txt +++ b/amarok/src/context/tools/CMakeLists.txt @@ -2,7 +2,7 @@ set(amarokpkg_SRCS amarokpkg.cpp ) -kde4_add_executable(amarokpkg ${amarokpkg_SRCS}) +add_executable(amarokpkg ${amarokpkg_SRCS}) target_link_libraries(amarokpkg ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) diff --git a/amarok/src/core-impl/collections/audiocd/CMakeLists.txt b/amarok/src/core-impl/collections/audiocd/CMakeLists.txt index a540bade..16d08b8b 100644 --- a/amarok/src/core-impl/collections/audiocd/CMakeLists.txt +++ b/amarok/src/core-impl/collections/audiocd/CMakeLists.txt @@ -21,10 +21,9 @@ set(amarok_collection-audiocdcollection_PART_SRCS handler/AudioCdHandler.cpp support/AudioCdDeviceInfo.cpp support/AudioCdConnectionAssistant.cpp + FormatSelectionDialog.ui ) -kde4_add_ui_files(amarok_collection-audiocdcollection_PART_SRCS FormatSelectionDialog.ui) - kde4_add_plugin(amarok_collection-audiocdcollection ${amarok_collection-audiocdcollection_PART_SRCS}) target_link_libraries( diff --git a/amarok/src/core-impl/collections/db/sql/CMakeLists.txt b/amarok/src/core-impl/collections/db/sql/CMakeLists.txt index a4ec08d1..d71a7d79 100644 --- a/amarok/src/core-impl/collections/db/sql/CMakeLists.txt +++ b/amarok/src/core-impl/collections/db/sql/CMakeLists.txt @@ -19,7 +19,7 @@ set( amarok_collection-sqlcollection_SRCS device/smb/SmbDeviceHandler.cpp ) -kde4_add_library(amarok-sqlcollection SHARED ${amarok_collection-sqlcollection_SRCS}) +add_library(amarok-sqlcollection SHARED ${amarok_collection-sqlcollection_SRCS}) target_link_libraries(amarok-sqlcollection ${KDE4_KDECORE_LIBS} diff --git a/amarok/src/core-impl/collections/umscollection/CMakeLists.txt b/amarok/src/core-impl/collections/umscollection/CMakeLists.txt index 712d2301..41f58bb0 100644 --- a/amarok/src/core-impl/collections/umscollection/CMakeLists.txt +++ b/amarok/src/core-impl/collections/umscollection/CMakeLists.txt @@ -10,13 +10,11 @@ include_directories( ../.. ########### next target ################ set(amarok_collection-umscollection_PART_SRCS - UmsCollection.cpp - UmsCollectionLocation.cpp - UmsTranscodeCapability.cpp - podcasts/UmsPodcastProvider.cpp - podcasts/UmsPodcastMeta.cpp) - -kde4_add_ui_files(amarok_collection-umscollection_PART_SRCS + UmsCollection.cpp + UmsCollectionLocation.cpp + UmsTranscodeCapability.cpp + podcasts/UmsPodcastProvider.cpp + podcasts/UmsPodcastMeta.cpp UmsConfiguration.ui ) diff --git a/amarok/src/core/CMakeLists.txt b/amarok/src/core/CMakeLists.txt index f8ef3384..043835cd 100644 --- a/amarok/src/core/CMakeLists.txt +++ b/amarok/src/core/CMakeLists.txt @@ -103,7 +103,7 @@ set(libcore_LIB_SRCS ${libcore_transcoding_SRCS} ) -kde4_add_library(amarokcore SHARED ${libcore_LIB_SRCS}) +add_library(amarokcore SHARED ${libcore_LIB_SRCS}) target_link_libraries(amarokcore amarokshared diff --git a/amarok/src/importers/amarok/CMakeLists.txt b/amarok/src/importers/amarok/CMakeLists.txt index 27168ab7..d7608256 100644 --- a/amarok/src/importers/amarok/CMakeLists.txt +++ b/amarok/src/importers/amarok/CMakeLists.txt @@ -9,10 +9,9 @@ set( amarok_importer-amarok_PART_SRCS AmarokProvider.cpp AmarokEmbeddedSqlConnection.cpp AmarokTrack.cpp + AmarokConfigWidget.ui ) -kde4_add_ui_files( amarok_importer-amarok_PART_SRCS AmarokConfigWidget.ui ) - kde4_add_plugin( amarok_importer-amarok ${amarok_importer-amarok_PART_SRCS} ) target_link_libraries( amarok_importer-amarok diff --git a/amarok/src/services/amazon/CMakeLists.txt b/amarok/src/services/amazon/CMakeLists.txt index e85f1ce4..ec23036c 100644 --- a/amarok/src/services/amazon/CMakeLists.txt +++ b/amarok/src/services/amazon/CMakeLists.txt @@ -28,9 +28,6 @@ set( amarok_service_amazonstore_PART_SRCS AmazonStore.cpp AmazonUrlRunner.cpp AmazonWantCountryWidget.cpp -) - -kde4_add_ui_files( amarok_service_amazonstore_PART_SRCS AmazonConfigWidget.ui AmazonShoppingCartDialog.ui AmazonWantCountryWidget.ui @@ -56,10 +53,9 @@ install(TARGETS amarok_service_amazonstore DESTINATION ${PLUGIN_INSTALL_DIR} ) set(kcm_amarok_service_amazonstore_PART_SRCSS AmazonSettingsModule.cpp AmazonConfig.cpp + AmazonConfigWidget.ui ) -kde4_add_ui_files( kcm_amarok_service_amazonstore_PART_SRCSS AmazonConfigWidget.ui ) - kde4_add_plugin( kcm_amarok_service_amazonstore ${kcm_amarok_service_amazonstore_PART_SRCSS} ) target_link_libraries( kcm_amarok_service_amazonstore ${KDE4_KUTILS_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBS} ) diff --git a/amarok/src/services/ampache/CMakeLists.txt b/amarok/src/services/ampache/CMakeLists.txt index b0fd9c74..5277c0ef 100644 --- a/amarok/src/services/ampache/CMakeLists.txt +++ b/amarok/src/services/ampache/CMakeLists.txt @@ -22,7 +22,7 @@ add_subdirectory( images ) set(libampache_account_login_SRCS AmpacheAccountLogin.cpp) -kde4_add_library(ampache_account_login SHARED ${libampache_account_login_SRCS}) +add_library(ampache_account_login SHARED ${libampache_account_login_SRCS}) target_link_libraries(ampache_account_login amaroklib amarokcore @@ -73,13 +73,15 @@ install(TARGETS ampache_account_login DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS ########### next target ############### - set(kcm_amarok_service_ampache_PART_SRCSS AddServerDialog.cpp AmpacheSettings.cpp AmpacheConfig.cpp ) - - kde4_add_ui_files( kcm_amarok_service_ampache_PART_SRCSS AmpacheConfigWidget.ui NewServerWidget.ui ) - - - kde4_add_plugin( kcm_amarok_service_ampache ${kcm_amarok_service_ampache_PART_SRCSS} ) + set(kcm_amarok_service_ampache_PART_SRCSS + AddServerDialog.cpp + AmpacheSettings.cpp + AmpacheConfig.cpp + AmpacheConfigWidget.ui + NewServerWidget.ui + ) + kde4_add_plugin(kcm_amarok_service_ampache ${kcm_amarok_service_ampache_PART_SRCSS} ) target_link_libraries( kcm_amarok_service_ampache ampache_account_login ${KDE4_KUTILS_LIBS} ${QT_QTCORE_LIBRARY} diff --git a/amarok/src/services/lastfm/CMakeLists.txt b/amarok/src/services/lastfm/CMakeLists.txt index a895bbab..d649e5ca 100644 --- a/amarok/src/services/lastfm/CMakeLists.txt +++ b/amarok/src/services/lastfm/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory( images ) set( amarok_service_lastfm_shared_SRCS LastFmServiceConfig.cpp ) -kde4_add_library( amarok_service_lastfm_shared SHARED ${amarok_service_lastfm_shared_SRCS} ) +add_library( amarok_service_lastfm_shared SHARED ${amarok_service_lastfm_shared_SRCS} ) target_link_libraries( amarok_service_lastfm_shared amarokcore ${KDE4_KDECORE_LIBS} diff --git a/amarok/src/services/magnatune/CMakeLists.txt b/amarok/src/services/magnatune/CMakeLists.txt index 4a96db41..af4b757c 100644 --- a/amarok/src/services/magnatune/CMakeLists.txt +++ b/amarok/src/services/magnatune/CMakeLists.txt @@ -30,10 +30,6 @@ set(amarok_service_magnatune_PART_SRCS MagnatuneStore.cpp MagnatuneUrlRunner.cpp MagnatuneXmlParser.cpp - -) - -kde4_add_ui_files( amarok_service_magnatune_PART_SRCS MagnatuneDownloadDialogBase.ui MagnatuneNeedUpdateWidget.ui MagnatuneRedownloadDialogBase.ui @@ -58,19 +54,21 @@ install(TARGETS amarok_service_magnatunestore DESTINATION ${PLUGIN_INSTALL_DIR} set(kcm_amarok_service_magnatune_PART_SRCSS MagnatuneSettingsModule.cpp MagnatuneConfig.cpp + MagnatuneConfigWidget.ui ) -kde4_add_ui_files( kcm_amarok_service_magnatune_PART_SRCSS MagnatuneConfigWidget.ui ) - - kde4_add_plugin( kcm_amarok_service_magnatunestore ${kcm_amarok_service_magnatune_PART_SRCSS} ) - -target_link_libraries( kcm_amarok_service_magnatunestore ${KDE4_KUTILS_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(kcm_amarok_service_magnatunestore + ${KDE4_KUTILS_LIBS} + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${KDE4_KDECORE_LIBRARY} + ${KDE4_KDEUI_LIBS} +) install(TARGETS kcm_amarok_service_magnatunestore DESTINATION ${PLUGIN_INSTALL_DIR}) - ########### install files ############### install( FILES amarok_service_magnatunestore.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/amarok/src/services/mp3tunes/CMakeLists.txt b/amarok/src/services/mp3tunes/CMakeLists.txt index e6fb01fe..3c71840c 100644 --- a/amarok/src/services/mp3tunes/CMakeLists.txt +++ b/amarok/src/services/mp3tunes/CMakeLists.txt @@ -45,7 +45,7 @@ if(LIBXML2_FOUND AND CURL_FOUND) Mp3tunesHarmonyDaemon ) - kde4_add_executable(amarokmp3tunesharmonydaemon NOGUI + add_executable(amarokmp3tunesharmonydaemon NOGUI ${amarok_service_mp3tunes_harmony_PART_SRCS} ) diff --git a/amarok/src/services/opmldirectory/CMakeLists.txt b/amarok/src/services/opmldirectory/CMakeLists.txt index 8086a84f..c66c6092 100644 --- a/amarok/src/services/opmldirectory/CMakeLists.txt +++ b/amarok/src/services/opmldirectory/CMakeLists.txt @@ -15,10 +15,9 @@ OpmlDirectoryInfoParser.cpp OpmlDirectoryModel.cpp OpmlDirectoryView.cpp + AddOpmlWidget.ui ) - kde4_add_ui_files( amarok_service_opmldirectory_PART_SRCS AddOpmlWidget.ui ) - kde4_add_plugin(amarok_service_opmldirectory ${amarok_service_opmldirectory_PART_SRCS}) target_link_libraries(amarok_service_opmldirectory amarokcore diff --git a/amarok/src/transcoding/CMakeLists.txt b/amarok/src/transcoding/CMakeLists.txt index 1ce48b72..9ad45039 100644 --- a/amarok/src/transcoding/CMakeLists.txt +++ b/amarok/src/transcoding/CMakeLists.txt @@ -15,13 +15,10 @@ set(amarok_transcoding_SRCS TranscodingPropertyWidget.cpp TranscodingPropertySliderWidget.cpp TranscodingSelectConfigWidget.cpp -) - -kde4_add_ui_files(amarok_transcoding_SRCS TranscodingAssistantDialog.ui ) -kde4_add_library(amarok-transcoding SHARED ${amarok_transcoding_SRCS}) +add_library(amarok-transcoding SHARED ${amarok_transcoding_SRCS}) target_link_libraries(amarok-transcoding ${KDE4_KDECORE_LIBS} @@ -34,10 +31,6 @@ target_link_libraries(amarok-transcoding amarokcore ) -if(APPLE) - SET_TARGET_PROPERTIES(amarok-transcoding PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") -endif(APPLE) - set_target_properties(amarok-transcoding PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install(TARGETS amarok-transcoding ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/ark/app/CMakeLists.txt b/ark/app/CMakeLists.txt index f1ef01bc..19c5999b 100644 --- a/ark/app/CMakeLists.txt +++ b/ark/app/CMakeLists.txt @@ -6,10 +6,7 @@ set(ark_SRCS mainwindow.cpp ) -# For Mac and Windows. -kde4_add_app_icon(ark_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-ark.png") - -kde4_add_executable( ark ${ark_SRCS} ) +add_executable( ark ${ark_SRCS} ) target_link_libraries( ark kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ) diff --git a/ark/kerfuffle/CMakeLists.txt b/ark/kerfuffle/CMakeLists.txt index 8c56b4f4..470e238b 100644 --- a/ark/kerfuffle/CMakeLists.txt +++ b/ark/kerfuffle/CMakeLists.txt @@ -7,18 +7,18 @@ set(kerfuffle_SRCS archive.cpp archiveinterface.cpp jobs.cpp - extractiondialog.cpp - adddialog.cpp - queries.cpp - addtoarchive.cpp - cliinterface.cpp - ) + extractiondialog.cpp + adddialog.cpp + queries.cpp + addtoarchive.cpp + cliinterface.cpp + extractiondialog.ui + adddialog.ui +) kde4_add_kcfg_files(kerfuffle_SRCS settings.kcfgc) -kde4_add_ui_files(kerfuffle_SRCS extractiondialog.ui adddialog.ui ) - -kde4_add_library(kerfuffle SHARED ${kerfuffle_SRCS}) +add_library(kerfuffle SHARED ${kerfuffle_SRCS}) target_link_libraries(kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS}) if (NOT WIN32) @@ -32,7 +32,7 @@ install(TARGETS kerfuffle ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES kerfufflePlugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) install(FILES ark.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -if (QJSON_FOUND) +if (QJSON_FOUND AND ENABLE_TESTING) # This is a hack to make QJSON work with both 0.7.1 (the latest stable) # and the current master (b440550), which uses a different casing for # the CMake variables. @@ -47,4 +47,4 @@ if (QJSON_FOUND) endif (QJSON_LIBRARIES AND QJSON_INCLUDE_DIR) add_subdirectory(tests) -endif (QJSON_FOUND) +endif () diff --git a/ark/kerfuffle/tests/CMakeLists.txt b/ark/kerfuffle/tests/CMakeLists.txt index c0285295..853228b3 100644 --- a/ark/kerfuffle/tests/CMakeLists.txt +++ b/ark/kerfuffle/tests/CMakeLists.txt @@ -6,7 +6,7 @@ set(JSONINTERFACE_SOURCES jsonarchiveinterface.cpp jsonparser.cpp ) -kde4_add_library(jsoninterface STATIC ${JSONINTERFACE_SOURCES}) +add_library(jsoninterface STATIC ${JSONINTERFACE_SOURCES}) macro(KERFUFFLE_UNIT_TESTS) foreach(_testname ${ARGN}) diff --git a/ark/part/CMakeLists.txt b/ark/part/CMakeLists.txt index a75d9b26..a92f49a1 100644 --- a/ark/part/CMakeLists.txt +++ b/ark/part/CMakeLists.txt @@ -1,17 +1,15 @@ set(arkpart_PART_SRCS - part.cpp - infopanel.cpp - arkviewer.cpp - archivemodel.cpp - archiveview.cpp - jobtracker.cpp - ) + part.cpp + infopanel.cpp + arkviewer.cpp + archivemodel.cpp + archiveview.cpp + jobtracker.cpp + infopanel.ui jobtracker.ui +) qt4_add_dbus_adaptor(arkpart_PART_SRCS dnddbusinterface.xml part.h Ark::Part) -kde4_add_ui_files(arkpart_PART_SRCS infopanel.ui ) -kde4_add_ui_files(arkpart_PART_SRCS jobtracker.ui ) - kde4_add_plugin(arkpart ${arkpart_PART_SRCS}) target_link_libraries(arkpart kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/ark/plugins/clirarplugin/CMakeLists.txt b/ark/plugins/clirarplugin/CMakeLists.txt index f0ec0d0d..1f5dcd8d 100644 --- a/ark/plugins/clirarplugin/CMakeLists.txt +++ b/ark/plugins/clirarplugin/CMakeLists.txt @@ -18,6 +18,8 @@ configure_file( install(TARGETS kerfuffle_clirar DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_clirar.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLIRAR_MIMETYPES}" PARENT_SCOPE) diff --git a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt index 02e7d9e2..503d421d 100644 --- a/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/authorize/CMakeLists.txt @@ -3,7 +3,7 @@ set(authorize_SRCS authorize.cpp ) -kde4_add_executable(bluedevil-authorize ${authorize_SRCS}) +add_executable(bluedevil-authorize ${authorize_SRCS}) target_link_libraries(bluedevil-authorize ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) diff --git a/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt b/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt index 2ea391b4..79efd0a6 100644 --- a/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/confirmmodechange/CMakeLists.txt @@ -3,7 +3,7 @@ set(confirmmodechange_SRCS confirmmodechange.cpp ) -kde4_add_executable(bluedevil-confirmmodechange ${confirmmodechange_SRCS}) +add_executable(bluedevil-confirmmodechange ${confirmmodechange_SRCS}) target_link_libraries(bluedevil-confirmmodechange ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) diff --git a/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt b/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt index dafa25a9..98275c88 100644 --- a/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/requestconfirmation/CMakeLists.txt @@ -3,7 +3,7 @@ set(requestconfirmation_SRCS requestconfirmation.cpp ) -kde4_add_executable(bluedevil-requestconfirmation ${requestconfirmation_SRCS}) +add_executable(bluedevil-requestconfirmation ${requestconfirmation_SRCS}) target_link_libraries(bluedevil-requestconfirmation ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) diff --git a/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt b/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt index 4c4a981f..a4354301 100644 --- a/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt +++ b/bluedevil/src/daemon/helpers/requestpin/CMakeLists.txt @@ -1,12 +1,10 @@ set(requestpin_SRCS main.cpp requestpin.cpp + dialogWidget.ui ) -kde4_add_ui_files(requestpin_UI - dialogWidget.ui) - -kde4_add_executable(bluedevil-requestpin ${requestpin_SRCS} ${requestpin_UI}) +add_executable(bluedevil-requestpin ${requestpin_SRCS} ${requestpin_UI}) target_link_libraries(bluedevil-requestpin ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS}) diff --git a/bluedevil/src/kcmodule/CMakeLists.txt b/bluedevil/src/kcmodule/CMakeLists.txt index 6c311283..5ae790cd 100644 --- a/bluedevil/src/kcmodule/CMakeLists.txt +++ b/bluedevil/src/kcmodule/CMakeLists.txt @@ -4,10 +4,9 @@ set(kcm_bluedeviltransfer_PART_SRCS bluedeviltransfer.cpp systemcheck.cpp kded.cpp + transfer.ui ) -kde4_add_ui_files(kcm_bluedeviltransfer_PART_SRCS_UI transfer.ui) - kde4_add_kcfg_files(kcm_bluedeviltransfer_PART_SRCS ../settings/filereceiversettings.kcfgc ../settings/globalsettings.kcfgc) @@ -22,7 +21,7 @@ qt4_add_dbus_interface(kcm_bluedeviltransfer_PART_SRCS kde4_add_plugin(kcm_bluedevildevices ${kcm_bluedevildevices_PART_SRCS}) kde4_add_plugin(kcm_bluedeviladapters ${kcm_bluedeviladapters_PART_SRCS}) -kde4_add_plugin(kcm_bluedeviltransfer ${kcm_bluedeviltransfer_PART_SRCS} ${kcm_bluedeviltransfer_PART_SRCS_UI}) +kde4_add_plugin(kcm_bluedeviltransfer ${kcm_bluedeviltransfer_PART_SRCS}) qt4_automoc(${kcm_bluedevildevices} ${kcm_bluedeviladapters} diff --git a/bluedevil/src/monolithic/CMakeLists.txt b/bluedevil/src/monolithic/CMakeLists.txt index 349b7123..c4fe3778 100644 --- a/bluedevil/src/monolithic/CMakeLists.txt +++ b/bluedevil/src/monolithic/CMakeLists.txt @@ -5,7 +5,7 @@ set(monolithic_SRCS qt4_add_dbus_interface(monolithic_SRCS org.bluez.Audio.xml audio_interface) -kde4_add_executable(bluedevil-monolithic ${monolithic_SRCS}) +add_executable(bluedevil-monolithic ${monolithic_SRCS}) target_link_libraries(bluedevil-monolithic ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) diff --git a/bluedevil/src/sendfile/CMakeLists.txt b/bluedevil/src/sendfile/CMakeLists.txt index 6c0cc28a..0c8d0b14 100644 --- a/bluedevil/src/sendfile/CMakeLists.txt +++ b/bluedevil/src/sendfile/CMakeLists.txt @@ -13,9 +13,6 @@ set(sendfilehelper_SRCS pages/selectfilespage.cpp pages/connectingpage.cpp sendfilesjob.cpp -) - -kde4_add_ui_files(sendfilehelper_SRCS pages/connecting.ui pages/selectfilediscover.ui discover.ui @@ -25,7 +22,7 @@ qt4_add_dbus_interface(sendfilehelper_SRCS org.bluez.obex.Client1.xml obexd_clie qt4_add_dbus_interface(sendfilehelper_SRCS org.bluez.obex.ObjectPush1.xml obexd_push) qt4_add_dbus_interface(sendfilehelper_SRCS org.bluez.obex.Transfer1.xml obexd_transfer) -kde4_add_executable(bluedevil-sendfile ${sendfilehelper_SRCS}) +add_executable(bluedevil-sendfile ${sendfilehelper_SRCS}) target_link_libraries(bluedevil-sendfile ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} bluedevil) diff --git a/bluedevil/src/wizard/CMakeLists.txt b/bluedevil/src/wizard/CMakeLists.txt index 31ad9811..5c4e5f30 100644 --- a/bluedevil/src/wizard/CMakeLists.txt +++ b/bluedevil/src/wizard/CMakeLists.txt @@ -11,19 +11,17 @@ set(wizard_SRCS pages/ssppairing.cpp pages/fail.cpp pages/success.cpp -) -kde4_add_ui_files(wizard_SRCS - pages/discover.ui - pages/nopairing.ui - pages/legacypairing.ui - pages/keyboardpairing.ui - pages/ssppairing.ui - pages/fail.ui - pages/success.ui + pages/discover.ui + pages/nopairing.ui + pages/legacypairing.ui + pages/keyboardpairing.ui + pages/ssppairing.ui + pages/fail.ui + pages/success.ui ) -kde4_add_executable(bluedevil-wizard ${wizard_SRCS}) +add_executable(bluedevil-wizard ${wizard_SRCS}) target_link_libraries(bluedevil-wizard ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} bluedevil) diff --git a/dragon/src/app/CMakeLists.txt b/dragon/src/app/CMakeLists.txt index efbd72a9..17a58e3c 100644 --- a/dragon/src/app/CMakeLists.txt +++ b/dragon/src/app/CMakeLists.txt @@ -24,11 +24,13 @@ set(videoplayer_app_SRCS loadView.cpp ../mpris2/mpris2.cpp ../mpris2/mediaplayer2.cpp - ../mpris2/mediaplayer2player.cpp ) + ../mpris2/mediaplayer2player.cpp + videoSettingsWidget.ui + loadView.ui + audioView2.ui +) -kde4_add_ui_files(videoplayer_app_SRCS videoSettingsWidget.ui loadView.ui audioView2.ui) - -kde4_add_executable(dragon ${videoplayer_app_SRCS} ) +add_executable(dragon ${videoplayer_app_SRCS} ) target_link_libraries(dragon ${KDE4_KIO_LIBS} diff --git a/ffmpegthumbs/tests/CMakeLists.txt b/ffmpegthumbs/tests/CMakeLists.txt index 5525e00d..1de0ad01 100644 --- a/ffmpegthumbs/tests/CMakeLists.txt +++ b/ffmpegthumbs/tests/CMakeLists.txt @@ -17,7 +17,7 @@ set(ffmpegthumbtest_SRCS ffmpegthumbtest.cpp ) -kde4_add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} ) +add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} ) target_link_libraries(ffmpegthumbtest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES}) diff --git a/filelight/src/app/CMakeLists.txt b/filelight/src/app/CMakeLists.txt index d395756a..47d63fe4 100644 --- a/filelight/src/app/CMakeLists.txt +++ b/filelight/src/app/CMakeLists.txt @@ -20,9 +20,7 @@ set(filelight_SRCS historyAction.cpp mainWindow.cpp main.cpp) -kde4_add_app_icon(filelight_SRCS "../../misc/hi*-app-filelight.png") - -kde4_add_executable(filelight ${filelight_SRCS}) +add_executable(filelight ${filelight_SRCS}) target_link_libraries(filelight ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/filelight/src/part/CMakeLists.txt b/filelight/src/part/CMakeLists.txt index 2608eb4a..54494edf 100644 --- a/filelight/src/part/CMakeLists.txt +++ b/filelight/src/part/CMakeLists.txt @@ -29,19 +29,19 @@ set(filelight_PART_SRCS fileTree.cpp localLister.cpp remoteLister.cpp - summaryWidget.cpp) - -kde4_add_ui_files(filelight_PART_SRCS dialog.ui) + summaryWidget.cpp + dialog.ui +) kde4_add_plugin(filelightpart ${filelight_PART_SRCS}) target_link_libraries(filelightpart radialmap - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_KFILE_LIBS} - ${KDE4_SOLID_LIBS}) - + ${KDE4_KDECORE_LIBS} + ${KDE4_KPARTS_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} + ${KDE4_KFILE_LIBS} + ${KDE4_SOLID_LIBS} +) install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/filelight/src/part/radialMap/CMakeLists.txt b/filelight/src/part/radialMap/CMakeLists.txt index 21824008..3ac719c1 100644 --- a/filelight/src/part/radialMap/CMakeLists.txt +++ b/filelight/src/part/radialMap/CMakeLists.txt @@ -25,7 +25,7 @@ set(radialmap_STAT_SRCS widgetEvents.cpp labels.cpp) -kde4_add_library(radialmap ${radialmap_STAT_SRCS} ) +add_library(radialmap ${radialmap_STAT_SRCS} ) set_target_properties(radialmap PROPERTIES COMPILE_FLAGS -fPIC) diff --git a/gwenview/CMakeLists.txt b/gwenview/CMakeLists.txt index ce7254c4..9ad35616 100644 --- a/gwenview/CMakeLists.txt +++ b/gwenview/CMakeLists.txt @@ -52,7 +52,9 @@ add_subdirectory(lib) add_subdirectory(app) add_subdirectory(importer) add_subdirectory(part) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(icons) add_subdirectory(images) add_subdirectory(cursors) diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt index 62664f4d..d9f6f919 100644 --- a/gwenview/app/CMakeLists.txt +++ b/gwenview/app/CMakeLists.txt @@ -2,17 +2,14 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${EXIV2_INCLUDE_DIR} ${LIBKONQ_INCLUDE_DIR} - ) + # For lib/gwenviewconfig.h and config-gwenview.h + ${CMAKE_CURRENT_BINARY_DIR}/.. +) -if (KIPI_FOUND) +if(KIPI_FOUND) include_directories(${KIPI_INCLUDE_DIR}) endif() -# For lib/gwenviewconfig.h and config-gwenview.h -include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/.. - ) - set(gwenview_SRCS abstractcontextmanageritem.cpp configdialog.cpp @@ -36,52 +33,43 @@ set(gwenview_SRCS startmainpage.cpp thumbnailviewhelper.cpp browsemainpage.cpp - ) - -if (KIPI_FOUND) - set (gwenview_SRCS - ${gwenview_SRCS} - kipiexportaction.cpp - kipiimagecollectionselector.cpp - kipiinterface.cpp - kipiuploadwidget.cpp - ) -endif() - -kde4_add_ui_files(gwenview_SRCS advancedconfigpage.ui fullscreenconfigwidget.ui generalconfigpage.ui imageviewconfigpage.ui startmainpage.ui browsemainpage.ui - ) +) -kde4_add_app_icon(gwenview_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview.png") +if(KIPI_FOUND) + set(gwenview_SRCS + ${gwenview_SRCS} + kipiexportaction.cpp + kipiimagecollectionselector.cpp + kipiinterface.cpp + kipiuploadwidget.cpp + ) +endif() -kde4_add_executable(gwenview ${gwenview_SRCS}) +add_executable(gwenview ${gwenview_SRCS}) -target_link_libraries(gwenview PRIVATE +target_link_libraries(gwenview ${KDE4_KFILE_LIBS} gwenviewlib ${KDE4_KIO_LIBS} ${LIBKONQ_LIBRARY} ${QT_QTCORE_LIBRARY} - ) - -target_link_libraries(gwenview PUBLIC ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY}) + ${KDE4_KIO_LIBS} +) -if (KIPI_FOUND) - target_link_libraries(gwenview PRIVATE ${KIPI_LIBRARIES}) +if(KIPI_FOUND) + target_link_libraries(gwenview ${KIPI_LIBRARIES}) endif() -install(TARGETS gwenview - ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS gwenview ${INSTALL_TARGETS_DEFAULT_ARGS}) + +install(FILES gwenviewui.rcm DESTINATION ${DATA_INSTALL_DIR}/gwenview) -install(FILES gwenviewui.rc - DESTINATION ${DATA_INSTALL_DIR}/gwenview) +install(PROGRAMS gwenview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(PROGRAMS gwenview.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES slideshow.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) +install(FILES slideshow.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) diff --git a/gwenview/importer/CMakeLists.txt b/gwenview/importer/CMakeLists.txt index a15d757e..a78f792a 100644 --- a/gwenview/importer/CMakeLists.txt +++ b/gwenview/importer/CMakeLists.txt @@ -18,22 +18,15 @@ set(importer_SRCS filenameformater.cpp serializedurlmap.cpp thumbnailpage.cpp - ) - -kde4_add_ui_files(importer_SRCS dialogpage.ui importerconfigdialog.ui progresspage.ui thumbnailpage.ui - ) +) -kde4_add_app_icon(importer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview-importer.png") +kde4_add_kcfg_files(importer_SRCS importerconfig.kcfgc) -kde4_add_kcfg_files(importer_SRCS - importerconfig.kcfgc - ) - -kde4_add_executable(gwenview_importer ${importer_SRCS}) +add_executable(gwenview_importer ${importer_SRCS}) target_link_libraries(gwenview_importer PRIVATE ${KDE4_KFILE_LIBS} @@ -41,16 +34,15 @@ target_link_libraries(gwenview_importer PRIVATE ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY} - ) +) target_link_libraries(gwenview_importer PUBLIC ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY} - ) +) -install(TARGETS gwenview_importer - ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS gwenview_importer ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES gwenview_importer.desktop gwenview_importer_camera.desktop diff --git a/gwenview/lib/CMakeLists.txt b/gwenview/lib/CMakeLists.txt index 01f6807a..4712eaf7 100644 --- a/gwenview/lib/CMakeLists.txt +++ b/gwenview/lib/CMakeLists.txt @@ -160,7 +160,12 @@ set(gwenviewlib_SRCS zoomwidget.cpp sorteddirmodel.cpp ${GV_JPEG_DIR}/transupp.c - ) + crop/cropwidget.ui + documentview/messageview.ui + print/printoptionspage.ui + redeyereduction/redeyereductionwidget.ui + resize/resizeimagewidget.ui +) set_source_files_properties( exiv2imageloader.cpp @@ -168,25 +173,12 @@ set_source_files_properties( timeutils.cpp PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" - ) - -kde4_add_ui_files(gwenviewlib_SRCS - crop/cropwidget.ui - documentview/messageview.ui - print/printoptionspage.ui - redeyereduction/redeyereductionwidget.ui - resize/resizeimagewidget.ui - ) +) -kde4_add_kcfg_files(gwenviewlib_SRCS - gwenviewconfig.kcfgc - ) +kde4_add_kcfg_files(gwenviewlib_SRCS gwenviewconfig.kcfgc) -kde4_add_library(gwenviewlib SHARED ${gwenviewlib_SRCS}) +add_library(gwenviewlib SHARED ${gwenviewlib_SRCS}) set_target_properties(gwenviewlib PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) -if (WIN32) - set_target_properties(gwenviewlib PROPERTIES COMPILE_FLAGS -DJPEG_STATIC) -endif() target_link_libraries(gwenviewlib ${KDE4_KFILE_LIBS} @@ -199,9 +191,6 @@ target_link_libraries(gwenviewlib ${PNG_LIBRARIES} ${LCMS2_LIBRARIES} ${KDCRAW_LIBRARIES} - ) -if (WIN32) - target_link_libraries(gwenviewlib ${EXPAT_LIBRARIES}) -endif() +) install(TARGETS gwenviewlib ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/gwenview/tests/manual/CMakeLists.txt b/gwenview/tests/manual/CMakeLists.txt index 19758336..077def44 100644 --- a/gwenview/tests/manual/CMakeLists.txt +++ b/gwenview/tests/manual/CMakeLists.txt @@ -6,7 +6,7 @@ set(slidecontainertest_SRCS slidecontainertest.cpp ) -kde4_add_executable(slidecontainertest TEST ${slidecontainertest_SRCS}) +add_executable(slidecontainertest TEST ${slidecontainertest_SRCS}) target_link_libraries(slidecontainertest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} gwenviewlib) @@ -15,7 +15,7 @@ set(imageloadbench_SRCS imageloadbench.cpp ) -kde4_add_executable(imageloadbench TEST ${imageloadbench_SRCS}) +add_executable(imageloadbench TEST ${imageloadbench_SRCS}) target_link_libraries(imageloadbench ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} gwenviewlib) @@ -25,7 +25,7 @@ set(thumbnailgen_SRCS ../auto/testutils.cpp # FIXME: Move testutils.cpp to test/ ) -kde4_add_executable(thumbnailgen TEST ${thumbnailgen_SRCS}) +add_executable(thumbnailgen TEST ${thumbnailgen_SRCS}) target_link_libraries(thumbnailgen ${QT_QTCORE_LIBRARY} diff --git a/jovie/filters/CMakeLists.txt b/jovie/filters/CMakeLists.txt index ffa6430d..1f8db871 100644 --- a/jovie/filters/CMakeLists.txt +++ b/jovie/filters/CMakeLists.txt @@ -7,13 +7,13 @@ add_subdirectory( talkerchooser ) ########### next target ############### -set(testfilter_SRCS main.cpp ) +if(ENABLE_TESTING) + set(testfilter_SRCS main.cpp ) + add_executable(testfilter TEST ${testfilter_SRCS}) -kde4_add_executable(testfilter TEST ${testfilter_SRCS}) - -target_link_libraries(testfilter ${KDE4_KDEUI_LIBS} kttsd ) - + target_link_libraries(testfilter ${KDE4_KDEUI_LIBS} kttsd ) +endif() ########### install files ############### diff --git a/jovie/filters/stringreplacer/CMakeLists.txt b/jovie/filters/stringreplacer/CMakeLists.txt index c090c962..650d4eb1 100644 --- a/jovie/filters/stringreplacer/CMakeLists.txt +++ b/jovie/filters/stringreplacer/CMakeLists.txt @@ -7,30 +7,31 @@ set(jovie_stringreplacerplugin_PART_SRCS stringreplacerconf.cpp stringreplacerproc.cpp stringreplacerplugin.cpp - cdataescaper.cpp) - -kde4_add_ui_files(jovie_stringreplacerplugin_PART_SRCS stringreplacerconfwidget.ui editreplacementwidget.ui ) + cdataescaper.cpp + stringreplacerconfwidget.ui + editreplacementwidget.ui +) kde4_add_plugin(jovie_stringreplacerplugin ${jovie_stringreplacerplugin_PART_SRCS}) - - target_link_libraries(jovie_stringreplacerplugin ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kttsd ) install(TARGETS jovie_stringreplacerplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### test cdata escaper ########## -set(test_cdataescaper_SRCS testcdataescaper.cpp cdataescaper.cpp) -kde4_add_unit_test( - test_cdataescaper TESTNAME jovie-cdata_esecaper - ${test_cdataescaper_SRCS} -) -target_link_libraries(test_cdataescaper - ${KDE4_KDECORE_LIBS} - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} -) +if(ENABLE_TESTING) + set(test_cdataescaper_SRCS testcdataescaper.cpp cdataescaper.cpp) + kde4_add_unit_test( + test_cdataescaper TESTNAME jovie-cdata_esecaper + ${test_cdataescaper_SRCS} + ) + target_link_libraries(test_cdataescaper + ${KDE4_KDECORE_LIBS} + ${QT_QTTEST_LIBRARY} + ${QT_QTCORE_LIBRARY} + ) +endif() ########### install files ############### diff --git a/jovie/filters/talkerchooser/CMakeLists.txt b/jovie/filters/talkerchooser/CMakeLists.txt index a2227c29..e9d5443e 100644 --- a/jovie/filters/talkerchooser/CMakeLists.txt +++ b/jovie/filters/talkerchooser/CMakeLists.txt @@ -6,15 +6,13 @@ set(jovie_talkerchooserplugin_PART_SRCS selecttalkerdlg.cpp talkerchooserconf.cpp talkerchooserproc.cpp - talkerchooserplugin.cpp ) - - -kde4_add_ui_files(jovie_talkerchooserplugin_PART_SRCS talkerchooserconfwidget.ui selecttalkerwidget.ui ) - + talkerchooserplugin.cpp + talkerchooserconfwidget.ui + selecttalkerwidget.ui +) kde4_add_plugin(jovie_talkerchooserplugin ${jovie_talkerchooserplugin_PART_SRCS}) - target_link_libraries(jovie_talkerchooserplugin ${KDE4_KIO_LIBS} kttsd ) install(TARGETS jovie_talkerchooserplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/jovie/filters/xmltransformer/CMakeLists.txt b/jovie/filters/xmltransformer/CMakeLists.txt index 36df714e..980aa702 100644 --- a/jovie/filters/xmltransformer/CMakeLists.txt +++ b/jovie/filters/xmltransformer/CMakeLists.txt @@ -2,14 +2,15 @@ ########### next target ############### -set(jovie_xmltransformerplugin_PART_SRCS xmltransformerconf.cpp xmltransformerproc.cpp xmltransformerplugin.cpp ) - -kde4_add_ui_files(jovie_xmltransformerplugin_PART_SRCS xmltransformerconfwidget.ui ) +set(jovie_xmltransformerplugin_PART_SRCS + xmltransformerconf.cpp + xmltransformerproc.cpp + xmltransformerplugin.cpp + xmltransformerconfwidget.ui +) kde4_add_plugin(jovie_xmltransformerplugin ${jovie_xmltransformerplugin_PART_SRCS}) - - target_link_libraries(jovie_xmltransformerplugin ${KDE4_KIO_LIBS} kttsd ) install(TARGETS jovie_xmltransformerplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/jovie/jovie/CMakeLists.txt b/jovie/jovie/CMakeLists.txt index fb96f5cf..a3187438 100644 --- a/jovie/jovie/CMakeLists.txt +++ b/jovie/jovie/CMakeLists.txt @@ -18,7 +18,7 @@ set(jovie_SRCS qt4_add_dbus_adaptor(jovie_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml jovie.h Jovie) -kde4_add_executable(jovie_bin ${jovie_SRCS}) +add_executable(jovie_bin ${jovie_SRCS}) set_target_properties(jovie_bin PROPERTIES OUTPUT_NAME jovie) diff --git a/jovie/kcmkttsmgr/CMakeLists.txt b/jovie/kcmkttsmgr/CMakeLists.txt index 605818ef..9f7beb8e 100644 --- a/jovie/kcmkttsmgr/CMakeLists.txt +++ b/jovie/kcmkttsmgr/CMakeLists.txt @@ -8,16 +8,16 @@ set(kcm_kttsd_PART_SRCS kcmkttsmgr.cpp kttsjobmgr.cpp addtalker.cpp - talkerwidget.cpp) - + talkerwidget.cpp + kcmkttsmgrwidget.ui + kttsjobmgr.ui + talkerwidget.ui +) qt4_add_dbus_interfaces(kcm_kttsd_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml ) -kde4_add_ui_files(kcm_kttsd_PART_SRCS kcmkttsmgrwidget.ui kttsjobmgr.ui talkerwidget.ui ) - kde4_add_plugin(kcm_kttsd ${kcm_kttsd_PART_SRCS}) - target_link_libraries(kcm_kttsd ${KDE4_KIO_LIBS} ${SPEECHD_LIBRARIES} kttsd ) install(TARGETS kcm_kttsd DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/jovie/libkttsd/CMakeLists.txt b/jovie/libkttsd/CMakeLists.txt index 72af8570..a261c11f 100644 --- a/jovie/libkttsd/CMakeLists.txt +++ b/jovie/libkttsd/CMakeLists.txt @@ -9,7 +9,7 @@ set(kttsd_LIB_SRCS filterconf.cpp talkerlistmodel.cpp ) -kde4_add_library(kttsd SHARED ${kttsd_LIB_SRCS}) +add_library(kttsd SHARED ${kttsd_LIB_SRCS}) target_link_libraries(kttsd ${SPEECHD_LIBRARIES} diff --git a/kcalc/CMakeLists.txt b/kcalc/CMakeLists.txt index 1f9c7ee9..030cfa20 100644 --- a/kcalc/CMakeLists.txt +++ b/kcalc/CMakeLists.txt @@ -1,32 +1,12 @@ project(kcalc) -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(KDE4 4.14.3 REQUIRED) - include(KDE4Defaults) - include_directories(${KDE4_INCLUDES}) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - - # If definitions like -D_GNU_SOURCE are needed for these checks they - # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally - # defined outside this file. Here we include these definitions in - # CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of - # checks below. - set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} ) - - set(GMP_REQUIRED TRUE) -else() - set(GMP_REQUIRED FALSE) -endif() - set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" ${CMAKE_SOURCE_DIR}/cmake/modules) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) find_package(GMP) -macro_log_feature( GMP_FOUND "GMP" "The GNU Multiple Precision Arithmetic Library" "http://gmplib.org/" ${GMP_REQUIRED} "" "Required for building KCalc.") +macro_log_feature( GMP_FOUND "GMP" "The GNU Multiple Precision Arithmetic Library" "http://gmplib.org/" FALSE "" "Required for building KCalc.") include(CheckTypeSize) include(CheckIncludeFiles) @@ -62,20 +42,17 @@ set(kcalc_SRCS ${libknumber_la_SRCS} kcalc_const_menu.cpp kcalc_core.cpp kcalcdisplay.cpp - stats.cpp ) - -kde4_add_ui_files(kcalc_SRCS + stats.cpp kcalc.ui constants.ui colors.ui fonts.ui - general.ui) + general.ui +) kde4_add_kcfg_files(kcalc_SRCS kcalc_settings.kcfgc ) -kde4_add_app_icon(kcalc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-calculator.png") - -kde4_add_executable( kcalc ${kcalc_SRCS}) +add_executable( kcalc ${kcalc_SRCS}) target_link_libraries(kcalc ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES}) diff --git a/kcalc/ChangeLog b/kcalc/ChangeLog deleted file mode 100644 index 8470e609..00000000 --- a/kcalc/ChangeLog +++ /dev/null @@ -1,381 +0,0 @@ -2005-04-30 Klaus Niederkrüger - * Fix BUG 100316 - -2005-04-25 Klaus Niederkrüger - * Fix BUG 99817. - -2005-04-20 Klaus Niederkrüger - * Change C-style casts for C++ casts, removed some C-style typedefs - -2005-04-02 Klaus Niederkrüger - * GUI: added statusflags to display, looks very neat (this was - contributed by Bernd Brandstetter; well done!) - -2005-03-30 Klaus Niederkrüger - * added a Memory-Store button (contributed by Bernd Brandstetter) - -2005-03-29 Klaus Niederkrüger - * fix M+/- button to change when inverse is pressed - -2005-03-08 Evan Teran - * updated about box to reflect my correct email address. This one is - permanent and will never change again - -2005-02-05 Klaus Niederkrüger - * fix BUG 98522: M- button did not work at least since KDE-3.2. Shame on me, and thanks to - Bernd Brandstetter for reporting the bug. - -2004-12-21 Klaus Niederkrüger - * added some more contants and dropped Pi-button since not needed. - Instead new cube and cube root button. - -2004-12-17 Klaus Niederkrüger - * almost finished feature which allows to choose from list - of scientific constants - -2004-12-17 Klaus Niederkrüger - * started implementation of a list of scientific constants - -2004-12-06 Klaus Niederkrüger - * further refactoring of configuration options for const buttons - -2004-12-05 Klaus Niederkrüger - * understood how kconfigxt handles indexed configuration options - -2004-12-03 Klaus Niederkrüger - * moving through history is now done via undo/redo - this implements wish BUG 93938 - -2004-11-23 Klaus Niederkrüger - * improved const buttons - -2004-10-20 Klaus Niederkrüger - * clean up Const-Buttons. More work still required. - -2004-10-16 Klaus Niederkrüger - * improve Const-Buttons: set value by using INV-Button instead of config-menu - -2004-09-24 Klaus Niederkrüger - * fixed BUG 90009: the display does not resize in vertical direction anymore - -2004-09-24 Klaus Niederkrüger - * fixed small bug: switching off Logic-mode tried to change item in statusbar, - but item did not exist. - -2004-09-11 Klaus Niederkrüger * - * fix bug 82433: show a check mark next to the angle mode in popup menu - -2004-09-10 Klaus Niederkrüger * - * bundle precedence of operators and function pointers into a single - struct. - -2004-09-08 Klaus Niederkrüger - * moved angle mode logic into GUI - -2004-09-04 Klaus Niederkrüger - * reduced the number of entry points into the CalcEngine - Aim: enterOperation the only entry point - -2004-08-2? Klaus Niederkrüger - * added some labels and tooltips for inverse mode - -2004-08-2? Klaus Niederkrüger - * fix to BUG 74657 - * fix to BUG 78726 - -2004-07-30 Klaus Niederkrüger - * Square root button did not work correctly after pressing CTRL (Bug 86004) - -2004-07-30 Klaus Niederkrüger - * Added Accels for Const-Buttons - -2004-07-29 Klaus Niederkrüger - * Fixed BUG 67984 (thanks to André Wöbbeking) - -2004-07-17 Klaus Niederkrüger - * Fixed BUG 85357 - -2004-06-05 Klaus Niederkrüger - * It was not possible to paste a hex-number starting with "0x" in hex-mode, because hex-mode - prepended automatically "0x" leading to "0x0x...". - -2004-05-16 Klaus Niederkrüger - * Refactored a bit the kcalc_button code. In particular use Richtext only, when needed (a bit faster, - but a lot still to be done). - -2004-05-04 Klaus Niederkrüger - * Masked "&" for the label of the AND button, when displaying the corresponding accel. - Thanks to Sigrid from Trolltech. - -2004-04-27 Klaus Niederkrüger - * Buttons have now their own modes (like inverse Mode etc.) - This allows moving tooltips and labels into kcalc_button.cpp - instead of having everything in kcalc.cpp. - This needs to be cleaned up and the tooltips and labels should be - revised. - -2004-04-05 Klaus Niederkrüger - * Changed accel for OR-button from "O" to "|" - * More accels are visible, when "Ctrl" is used - * disable some buttons like "Sin", "Cos" etc., when not - in decimal mode - -2004-04-05 Klaus Niederkrüger - * Pasted numbers in Hex-Mode are now always interpreted as - hex-numbers (BUG 65167). - -2004-03-26 Klaus Niederkrüger - * Centered labels on buttons - -2004-03-24 Klaus Niederkrüger - * Press (and hold) CTRL-key to see accels for all - buttons (BUG 69850). - -2004-03-19 Klaus Niederkrüger - * Labels like e.g. "x^y" are drawn with QSimpleRichText - Need to center the labels better!! - * KCalcButton supports now two different labels, one for normal, one - for inverse mode. Switch between the two happens via a signal. - -2004-03-11 Klaus Niederkrüger - * Moved functions that paint e.g. "x^y" to the KCalcButton-class. - -2004-03-01 Klaus Niederkrüger - * Created class KCalcButton, which is now used for all QPushButtons. - This will allow later to change the labels more easily, if INV is - pressed, and mucho more... - -2004-02-25 Thomas Weber - * "x^2" and "x^y"-buttons have now superscripted labels - * pressing "INV"-button changes "x^2"-button to square-root etc. - -2004-02-25 Klaus Niederkrüger - * Changed many accels from "accel()->insert()" to - "button->addAccel()". Fixes BUG 75555. - * deactivate EE-button, when Base != DEC - -2004-02-10 Klaus Niederkrüger - * First step to fix bug 66397. Changing Basemode via Popupmenu is - too clumsy for most programmers. Maybe backport to KDE 3.2 later, - once it has been tested. GUI does not look nice. - -2004-02-06 Klaus Niederkrüger - * Fixed bug 73437. Pasting empty clipboard made kcalc crash. - -2004-02-04 Klaus Niederkrüger - * Moved more accels from keyPressEvent into accels - -2004-01-27 Klaus Niederkrüger - * Fix paste-function: Pasting e.g. "123 \n" did not work - because of the trailing spaces and returns. - -2004-01-25 Klaus Niederkrüger - * Applied patch from Thomas Weber: Creates buttons C1-C6 - to store constants - -2003-12-06 Klaus Niederkrüger - * Fix problem with several identical labels in statusbar - with the help of newly added statusbar->hasItem. - -2003-12-06 Klaus Niederkrüger - * Make Percent work the way it did in KDE-3.1 again (documentation - was not updated to this KDE-version, which confused me on 2003/08/28) - -2003-11-04 Klaus Niederkrüger - * More reorganization and preparation for getting accels right. - -2003-10-31 Klaus Niederkrüger - * Split Constructor into more subfunctions. - To be continued. - -2003-10-20 Klaus Niederkrüger - * At last the calculator window resizes, when buttons are hidden/shown - * Added a few extra buttons to "fill gaps". - -2003-10-14 Klaus Niederkrüger - * RadioButtons for Base and Angle converted to PopUpMenu+Button - * Layout changed - * Moved ENTER form keyPressedEvent to Accel() - -2003-10-10 Klaus Niederkrüger - * Number buttons look like numeric keyboard (on US-keyboards that is) - * Initialize ToggleActions correctly - -2003-10-09 Klaus Niederkrüger - * Reverted the menubar stuff after several complaints. - Now Kcalc-GUI looks again like on 2003-09-11. - -2003-09-30 Klaus Niederkrüger - * Fixed bug (unitialized pointers) - -2003-09-26 Klaus Niederkrüger - * Moved all type of buttons to menubars, which can be hidden/showed - via the menubar. This is quite experimental and full of bugs. - -2003-09-11 Klaus Niederkrüger - * Button groups can be switch on/off via actions. - This is not yet the final GUI-Layout (yes, it looks broken). - * Accordingly the Stat/Trig-mode has been deleted from - configure window. - -2003-09-11 Klaus Niederkrüger - * deleted a few #includes - -2003-09-02 Klaus Niederkrüger - * dropped configure-button and Help-button - * created menubar with standard-actions - * ConfigDialog is not modal anymore - * copy/paste/cut-standard actions applied to calc_display - -2003-08-28 Klaus Niederkrüger - * created Pi-button and moved Inv-button to make space for it - * label of "."-button is now localized - * Caption is set via signal/slots - * Fixed "%"-mode to make it again more conformant with documentation. - "x^y%" does still not work. Did it ever? - * Number-keys are now handled by KAccel instead of keyPressEvent - * ConfigDialog is modal - -2003-08-27 Klaus Niederkrüger - * moved result_history from CalcEngine into DispLogic - * reactivation of rounding towards zero for cos(90) etc. - * quit is done in a more KDE conformant way - * Caption is set via slots etc. - -2003-08-12 Klaus Niederkrüger - * continued separation: now display is independent class and - handles everything related to itself. - GUI passes only information between core and display. - -2003-08-04 Klaus Niederkrüger - * finished the separation of gui-code from the calculating core. - this still needs some clean-up - -2003-02-11 Evan Teran - * replaced cheasy stack with STL stack classes (it really should have been - two stacks, but was mushed into one with a linked list dividing content) - * made it use new headers (no .h) when _ISOC99_SOURCE is defined - * added replace current gui code with ui files to TODO list - -2002-05-10 Evan Teran - * altered makefile to remove building of it as a library then linking that - to a dummy object file, this was silly and caused inclusion of an uneeded - source file - * bumped version to reflect new options dialog, next version will be 2.0.0 - as it will have many new changes/features - -2002-03-11 Evan Teran - * started work on making calculator code _seperate_ from the - gui code, the goal here is the make the calculating core - replacable with any library (hopfully with better precision) simply by - wrapping it in a class - * made it some many buttons are disabled when unavailabled (A-F) not enabled - unless we are in HEX mode, less confusion for users who arent familiar with - different bases - * removed some code that is never getting called - * why oh why are exceptions disabled in the standard config, I would like to - use them :( - -2001-10-18 Evan Teran - * removed configdlg.* from source tree as it is not part of the compile - * changed options dialog to use smarter layouts, and also fixed spinbox - size problem so they are now usable - * synced changed I made to the KDE 2.2.1 release version to match CVS - version which compiles under KDE 3.0 w/ QT 3.0.0 - * made sure the clear (clear entry) button functioned properly, my minor - change before broke it in some situations - - -2001-10-12 Evan Teran - * Reorganized code for all files, much more consistant now - * completely reworked the cvb (convert to binary) function - it now is sane, the last one did a rediculous amount of - unneeded work - * changed C/C++ headers to use new style as per ANSI/ISO - standard - * removed fontdlg.cpp/h from tree, not even used in compile :P - * made binary mode 32-bit - * reorganized UpdateDisplay code to make more sense - * found possible nasty memleak in EnterEqual - * now use my UNUSED macro to perform (void)var on unused parameters - to avoid compile warnings, much more readable this way - * merged setXXX functions to angle_selected/base_selected - then removed the setXXX functions as they no longer have any purpose - * changed a ton of code to use true C++ bools, makes logic - more clear - * made cvb a static member of QtCalculator instead of an ugly global - function - * changed history to use a simple vectory object instead of the storing - the values in a dynamically allocated QList, it was clearly leaking memory - as it was almost never released, this could have been fixed by enabling the - autodelete feature of QList...but why dynamically allocate when we are - storing numerical values?!? simple array with an int as an iterator :) - * changed error trapping from C style signal trapping, rather use exceptions - much cleaner that way - * removed un-used TopOfStack function - * fixed ability to enter a decimal point when in hex/oct/bin mode, those are - integer value only modes - * fixed problem with entering multiple decimal points in decimal mode - * changed CALCAMNT to be defined by a typedef, I did notice that at least my - C++ math headers are broken...functions like cos should (by newest - standards) use float, double, or long double versions automatically based on - datatype, however mine (Redhat 7.1) seems to only have the old double - versions, and have alternate names for these functions - * fixed the fact that the normal clear button seemingly did nothing - - -1999-08-22 Bernd Johannes Wuebben - - * kcalc_core.cpp (UpdateDisplay): - Re-enabled the use of long double. Most if not all distributions - come now with a working glib math library. - -Mon Nov 16 18:05:01 1998 Mario Weilguni - - * There was an error in the stdev forumal. Fixed. - * the population standard deviation had the same fault. Fixed. - -Mon Nov 16 18:05:01 1998 Mario Weilguni - - * calculation the facturial of a too large number was delayed, - even though infinity was already reached. Now kcalc stops - calculation if infinity is reached and displays an error - -Mon May 4 06:28:09 1998 Bernd Johannes Wuebben - - * Added the comma key as an accelerator for '.' - -Sat Apr 18 16:26:52 1998 Bernd Johannes Wuebben - - * Some inverse functions didn't compute right. Wonder who broke them. - -Sun Feb 8 16:11:34 1998 Bernd Johannes Wuebben - - * removed a compiler warning - -Sat Nov 22 14:30:37 1997 Bernd Johannes Wuebben - - * stats.cpp: fixed some bugs in the stats module - mean should now be correct - std shoudl now be correct too. - -Sat Sep 20 23:59:30 1997 Bernd Johannes Wuebben - - * kcalc.cpp: Added statistical functions - -Mon Sep 15 00:34:58 1997 Bernd Johannes Wuebben - - * added cut and pasted functionality - * implemented EE - * implemented result stack - * implemented precision and fixed precision - * added key bindings - * tooltips - * added configuration dialog - - -Sat Aug 2 22:06:59 1997 Bernd Johannes Wuebben - - * kcalc.h: clean up - - diff --git a/kcalc/knumber/CMakeLists.txt b/kcalc/knumber/CMakeLists.txt index b2d7cb6d..a0f2314e 100644 --- a/kcalc/knumber/CMakeLists.txt +++ b/kcalc/knumber/CMakeLists.txt @@ -1,2 +1,3 @@ - -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory( tests ) +endif() diff --git a/kcharselect/CMakeLists.txt b/kcharselect/CMakeLists.txt index 9920e838..09145032 100644 --- a/kcharselect/CMakeLists.txt +++ b/kcharselect/CMakeLists.txt @@ -20,9 +20,7 @@ endif() set(kcharselect_SRCS kcharselectdia.cc main.cc ) -kde4_add_app_icon(kcharselect_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-character-map.png") - -kde4_add_executable(kcharselect ${kcharselect_SRCS}) +add_executable(kcharselect ${kcharselect_SRCS}) target_link_libraries(kcharselect ${KDE4_KDEUI_LIBS} ) diff --git a/kcolorchooser/CMakeLists.txt b/kcolorchooser/CMakeLists.txt index 069cab66..140b7ba8 100644 --- a/kcolorchooser/CMakeLists.txt +++ b/kcolorchooser/CMakeLists.txt @@ -1,19 +1,17 @@ project(kcolorchooser) -# search packages used by KDE -find_package(KDE4 4.14.3 REQUIRED) -include(KDE4Defaults) -include(MacroLibrary) -include(MacroOptionalAddSubdirectory) +if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(KDE4 4.14.3 REQUIRED) + include(KDE4Defaults) + include(MacroLibrary) +endif() add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) set(kcolorchooser_SRCS kcolorchooser.cpp ) -kde4_add_app_icon(kcolorchooser_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kcolorchooser.png") - -kde4_add_executable(kcolorchooser ${kcolorchooser_SRCS}) +add_executable(kcolorchooser ${kcolorchooser_SRCS}) target_link_libraries(kcolorchooser ${KDE4_KDEUI_LIBS}) diff --git a/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt b/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt index 039526c6..e7686262 100644 --- a/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt +++ b/kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt @@ -1,9 +1,11 @@ ########### next target ############### -set(sambausershareplugin_PART_SRCS sambausershareplugin.cpp delegate.cpp model.cpp) - -kde4_add_ui_files(sambausershareplugin_PART_SRCS sambausershareplugin.ui) - +set(sambausershareplugin_PART_SRCS + sambausershareplugin.cpp + delegate.cpp + model.cpp + sambausershareplugin.ui +) kde4_add_plugin(sambausershareplugin ${sambausershareplugin_PART_SRCS}) diff --git a/kdeplasma-addons/applets/bball/CMakeLists.txt b/kdeplasma-addons/applets/bball/CMakeLists.txt index a3ab3e95..78c2f4fa 100644 --- a/kdeplasma-addons/applets/bball/CMakeLists.txt +++ b/kdeplasma-addons/applets/bball/CMakeLists.txt @@ -1,8 +1,6 @@ project(bball) -set(bball_SRCS bball.cpp) - -kde4_add_ui_files(bball_SRCS bballConfig.ui) +set(bball_SRCS bball.cpp bballConfig.ui) kde4_add_plugin(plasma_applet_bball ${bball_SRCS}) diff --git a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt index b42a6e76..fe3e09e5 100644 --- a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt +++ b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt @@ -1,8 +1,7 @@ project(binaryclock) -set(binaryclock_SRCS binaryclock.cpp) +set(binaryclock_SRCS binaryclock.cpp clockConfig.ui) -kde4_add_ui_files(binaryclock_SRCS clockConfig.ui) kde4_add_plugin(plasma_applet_binaryclock ${binaryclock_SRCS}) target_link_libraries(plasma_applet_binaryclock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt index 89568960..ea026821 100644 --- a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt +++ b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt @@ -1,8 +1,8 @@ set(bubblemon_SRCS bubble.cpp - ) + settings.ui +) -kde4_add_ui_files(bubblemon_SRCS settings.ui) kde4_add_plugin(plasma_applet_bubblemon ${bubblemon_SRCS}) target_link_libraries(plasma_applet_bubblemon ${KDE4_PLASMA_LIBS}) diff --git a/kdeplasma-addons/applets/comic/CMakeLists.txt b/kdeplasma-addons/applets/comic/CMakeLists.txt index f45128b6..d7f9b308 100644 --- a/kdeplasma-addons/applets/comic/CMakeLists.txt +++ b/kdeplasma-addons/applets/comic/CMakeLists.txt @@ -12,13 +12,10 @@ set(comic_SRCS comicsaver.cpp stripselector.cpp activecomicmodel.cpp -) - -kde4_add_ui_files(comic_SRCS - comicSettings.ui - appearanceSettings.ui - advancedsettings.ui - comicarchivedialog.ui + comicSettings.ui + appearanceSettings.ui + advancedsettings.ui + comicarchivedialog.ui ) kde4_add_plugin(plasma_applet_comic ${comic_SRCS}) diff --git a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt index 561992b1..5e427275 100644 --- a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt +++ b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt @@ -3,9 +3,7 @@ project(plasma-fifteenPuzzle) add_subdirectory(icons) include_directories( ${KDE4_INCLUDES} ) -set(fifteenPuzzle_SRCS src/fifteenPuzzle.cpp src/fifteen.cpp src/piece.cpp ) - -kde4_add_ui_files(fifteenPuzzle_SRCS src/fifteenPuzzleConfig.ui ) +set(fifteenPuzzle_SRCS src/fifteenPuzzle.cpp src/fifteen.cpp src/piece.cpp src/fifteenPuzzleConfig.ui ) kde4_add_plugin(plasma_applet_fifteenPuzzle ${fifteenPuzzle_SRCS}) target_link_libraries(plasma_applet_fifteenPuzzle ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) diff --git a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt index dc680ecd..b84e1c60 100644 --- a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt +++ b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt @@ -1,9 +1,13 @@ project(plasma-fileWatcher) include_directories( ${KDE4_INCLUDES} ) -set(fileWatcher_SRCS fileWatcher.cpp fileWatcherTextItem.cpp) +set(fileWatcher_SRCS + fileWatcher.cpp + fileWatcherTextItem.cpp + fileWatcherConfig.ui + filtersConfig.ui +) -kde4_add_ui_files(fileWatcher_SRCS fileWatcherConfig.ui filtersConfig.ui) kde4_add_plugin(plasma_applet_fileWatcher ${fileWatcher_SRCS}) target_link_libraries(plasma_applet_fileWatcher ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) diff --git a/kdeplasma-addons/applets/frame/CMakeLists.txt b/kdeplasma-addons/applets/frame/CMakeLists.txt index a1012dc2..33c5f07c 100644 --- a/kdeplasma-addons/applets/frame/CMakeLists.txt +++ b/kdeplasma-addons/applets/frame/CMakeLists.txt @@ -9,15 +9,15 @@ set(frame_SRCS picture.cpp imagescaler.cpp imageloader.cpp - configdialog.cpp) - -kde4_add_ui_files(frame_SRCS imageSettings.ui appearanceSettings.ui) + configdialog.cpp + imageSettings.ui + appearanceSettings.ui +) macro_bool_to_01(KEXIV2_FOUND HAVE_KEXIV2) kde4_add_plugin(plasma_applet_frame ${frame_SRCS}) - if(HAVE_KEXIV2) include_directories( ${KEXIV2_INCLUDE_DIR} ) set_source_files_properties(picture.cpp imageloader.cpp PROPERTIES diff --git a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt index 1068150a..9cb99d0b 100644 --- a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt +++ b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt @@ -1,8 +1,7 @@ project(fuzzy-clock) -set(fuzzyclock_SRCS fuzzyClock.cpp) +set(fuzzyclock_SRCS fuzzyClock.cpp fuzzyClockConfig.ui ) -kde4_add_ui_files(fuzzyclock_SRCS fuzzyClockConfig.ui ) kde4_add_plugin(plasma_applet_fuzzy_clock ${fuzzyclock_SRCS}) target_link_libraries(plasma_applet_fuzzy_clock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/kdeplasma-addons/applets/icontasks/CMakeLists.txt b/kdeplasma-addons/applets/icontasks/CMakeLists.txt index 58548e81..cc4a5daf 100644 --- a/kdeplasma-addons/applets/icontasks/CMakeLists.txt +++ b/kdeplasma-addons/applets/icontasks/CMakeLists.txt @@ -1,10 +1,30 @@ set(tasks_SRCS - windowtaskitem.cpp tasks.cpp taskitemlayout.cpp abstracttaskitem.cpp taskgroupitem.cpp applauncheritem.cpp - jobmanager.cpp dockmanager.cpp dockitem.cpp dockhelper.cpp dockconfig.cpp mediabuttons.cpp unity.cpp unityitem.cpp - dbusstatus.cpp recentdocuments.cpp - tooltips/tooltipcontent.cpp tooltips/tooltip.cpp tooltips/tooltipmanager.cpp tooltips/windowpreview.cpp - tooltips/dialogshadows.cpp tooltips/dialogshadows_p.h - ) + windowtaskitem.cpp + tasks.cpp + taskitemlayout.cpp + abstracttaskitem.cpp + taskgroupitem.cpp + applauncheritem.cpp + jobmanager.cpp + dockmanager.cpp + dockitem.cpp + dockhelper.cpp + dockconfig.cpp + mediabuttons.cpp + unity.cpp + unityitem.cpp + dbusstatus.cpp + recentdocuments.cpp + tooltips/tooltipcontent.cpp + tooltips/tooltip.cpp + tooltips/tooltipmanager.cpp + tooltips/windowpreview.cpp + tooltips/dialogshadows.cpp + tooltips/dialogshadows_p.h + appearanceconfig.ui + behaviourconfig.ui + dockconfig.ui +) # Generate DBUS XML files, would like to use # qt4_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dockmanager.h net.launchpad.DockManager.xml) @@ -47,7 +67,6 @@ ENDMACRO(QT4_ADD_DBUS_INTERFACE_EX) qt4_add_dbus_interface_ex(tasks_SRCS org.freedesktop.MediaPlayer.player.xml playerv1interface dbusstatus.h) -kde4_add_ui_files(tasks_SRCS appearanceconfig.ui behaviourconfig.ui dockconfig.ui) 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}) diff --git a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt index 112d77cf..13518e39 100644 --- a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt +++ b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt @@ -2,10 +2,7 @@ project(plasma-incomingmsg) # We add our source code here -set(incomingmsg_SRCS incomingmsg.cpp) - -# Now make sure all files get to the right place -kde4_add_ui_files(incomingmsg_SRCS widget.ui) +set(incomingmsg_SRCS incomingmsg.cpp widget.ui) kde4_add_plugin(plasma_applet_incomingmsg ${incomingmsg_SRCS}) target_link_libraries(plasma_applet_incomingmsg diff --git a/kdeplasma-addons/applets/incomingmsg/ChangeLog b/kdeplasma-addons/applets/incomingmsg/ChangeLog deleted file mode 100644 index 12cddea3..00000000 --- a/kdeplasma-addons/applets/incomingmsg/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -v 0.01 -* First usable release. -v 0.02 -* Added qutIM support diff --git a/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt index e3a76446..c0fe4bdb 100644 --- a/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt +++ b/kdeplasma-addons/applets/kimpanel/src/CMakeLists.txt @@ -12,9 +12,9 @@ set(plasma_applet_kimpanel_SRCS icongridlayout.cpp paintutils.cpp dummywidget.cpp + config.ui ) -kde4_add_ui_files(plasma_applet_kimpanel_SRCS config.ui) kde4_add_kcfg_files(plasma_applet_kimpanel_SRCS kimpanelconfig.kcfgc) kde4_add_plugin(plasma_applet_kimpanel ${plasma_applet_kimpanel_SRCS}) target_link_libraries(plasma_applet_kimpanel diff --git a/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt index b599f113..97783947 100644 --- a/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/application/CMakeLists.txt @@ -61,16 +61,12 @@ qt4_add_dbus_adaptor(plasma_lancelot_application_SRCS org.kde.lancelot.xml set( plasma_lancelot_SRCS main.cpp + LancelotConfigBase.ui ${plasma_lancelot_application_SRCS} ) -kde4_add_ui_files( - plasma_lancelot_SRCS - ui/LancelotConfigBase.ui -) - -kde4_add_executable(lancelot-menu ${plasma_lancelot_SRCS}) +add_executable(lancelot-menu ${plasma_lancelot_SRCS}) target_link_libraries( lancelot-menu diff --git a/kdeplasma-addons/applets/lancelot/application/ui/LancelotConfigBase.ui b/kdeplasma-addons/applets/lancelot/application/LancelotConfigBase.ui similarity index 100% rename from kdeplasma-addons/applets/lancelot/application/ui/LancelotConfigBase.ui rename to kdeplasma-addons/applets/lancelot/application/LancelotConfigBase.ui diff --git a/kdeplasma-addons/applets/lancelot/application/ui/LancelotWindowBase.xml b/kdeplasma-addons/applets/lancelot/application/LancelotWindowBase.xml similarity index 100% rename from kdeplasma-addons/applets/lancelot/application/ui/LancelotWindowBase.xml rename to kdeplasma-addons/applets/lancelot/application/LancelotWindowBase.xml diff --git a/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt index d27f3d38..280a63b3 100644 --- a/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/launcher/CMakeLists.txt @@ -23,16 +23,8 @@ set(plasma_applet_lancelot_launcher_SRCS LancelotApplet.cpp LancelotAppletConfig.cpp ../application/LancelotConfig.cpp -) - -kde4_add_ui_files( - plasma_applet_lancelot_launcher_SRCS LancelotAppletConfigBase.ui -) - -kde4_add_ui_files( - plasma_applet_lancelot_launcher_SRCS - ../application/ui/LancelotConfigBase.ui + ../application/LancelotConfigBase.ui ) kde4_add_plugin(plasma_applet_lancelot_launcher ${plasma_applet_lancelot_launcher_SRCS}) diff --git a/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt index e2fa0b68..550020d2 100644 --- a/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt +++ b/kdeplasma-addons/applets/lancelot/parts/CMakeLists.txt @@ -18,10 +18,6 @@ set(plasma_applet_lancelot_part_SRCS LancelotPart.cpp PartsMergedModel.cpp LancelotPartConfig.cpp -) - -kde4_add_ui_files( - plasma_applet_lancelot_part_SRCS LancelotPartConfigBase.ui ) diff --git a/kdeplasma-addons/applets/leavenote/CMakeLists.txt b/kdeplasma-addons/applets/leavenote/CMakeLists.txt index 6a96889a..939ccb85 100644 --- a/kdeplasma-addons/applets/leavenote/CMakeLists.txt +++ b/kdeplasma-addons/applets/leavenote/CMakeLists.txt @@ -2,10 +2,7 @@ project(plasma-leavenote) # We add our source code here -set(leavenote_SRCS leavenote.cpp) - -# Now make sure all files get to the right place -kde4_add_ui_files(leavenote_SRCS widget.ui) +set(leavenote_SRCS leavenote.cpp widget.ui) kde4_add_plugin(plasma_applet_leavenote ${leavenote_SRCS}) target_link_libraries(plasma_applet_leavenote diff --git a/kdeplasma-addons/applets/leavenote/ChangeLog b/kdeplasma-addons/applets/leavenote/ChangeLog deleted file mode 100644 index 2624127e..00000000 --- a/kdeplasma-addons/applets/leavenote/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -v 0.01 -* First usable release. diff --git a/kdeplasma-addons/applets/life/CMakeLists.txt b/kdeplasma-addons/applets/life/CMakeLists.txt index 4c2de7fc..1924938e 100644 --- a/kdeplasma-addons/applets/life/CMakeLists.txt +++ b/kdeplasma-addons/applets/life/CMakeLists.txt @@ -1,8 +1,6 @@ project(life) -set(life_SRCS life.cpp) - -kde4_add_ui_files(life_SRCS lifeConfig.ui) +set(life_SRCS life.cpp lifeConfig.ui) kde4_add_plugin(plasma_applet_life ${life_SRCS}) target_link_libraries(plasma_applet_life ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/kdeplasma-addons/applets/luna/CMakeLists.txt b/kdeplasma-addons/applets/luna/CMakeLists.txt index db25215d..fac4f4ad 100644 --- a/kdeplasma-addons/applets/luna/CMakeLists.txt +++ b/kdeplasma-addons/applets/luna/CMakeLists.txt @@ -1,8 +1,6 @@ project(luna) -set(luna_SRCS luna.cpp) - -kde4_add_ui_files(luna_SRCS lunaConfig.ui) +set(luna_SRCS luna.cpp lunaConfig.ui) kde4_add_plugin(plasma_applet_luna ${luna_SRCS}) target_link_libraries(plasma_applet_luna ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) @@ -14,6 +12,6 @@ install(FILES plasma-applet-luna.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES luna.svgz - DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) + DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/) kde4_install_icons(${ICON_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/microblog/CMakeLists.txt b/kdeplasma-addons/applets/microblog/CMakeLists.txt index 7b14f5e0..543e899d 100644 --- a/kdeplasma-addons/applets/microblog/CMakeLists.txt +++ b/kdeplasma-addons/applets/microblog/CMakeLists.txt @@ -3,8 +3,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ) set(microblog_SRCS microblog.cpp - postwidget.cpp) -kde4_add_ui_files(microblog_SRCS configuration.ui) + postwidget.cpp + configuration.ui +) kde4_add_plugin(plasma_applet_microblog ${microblog_SRCS}) target_link_libraries(plasma_applet_microblog ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) diff --git a/kdeplasma-addons/applets/news/CMakeLists.txt b/kdeplasma-addons/applets/news/CMakeLists.txt index 42e835d5..42546603 100644 --- a/kdeplasma-addons/applets/news/CMakeLists.txt +++ b/kdeplasma-addons/applets/news/CMakeLists.txt @@ -1,15 +1,19 @@ project(plasma-news) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set(news_SRCS news.cpp + config.ui + feedsConfig.ui ) -kde4_add_ui_files(news_SRCS config.ui feedsConfig.ui) - kde4_add_plugin(plasma_applet_news ${news_SRCS}) -target_link_libraries(plasma_applet_news ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${QT_QTWEBKIT_LIBRARY}) +target_link_libraries(plasma_applet_news + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${QT_QTWEBKIT_LIBRARY} +) install(TARGETS plasma_applet_news DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-news.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/notes/CMakeLists.txt b/kdeplasma-addons/applets/notes/CMakeLists.txt index c1c61915..f530a9c5 100644 --- a/kdeplasma-addons/applets/notes/CMakeLists.txt +++ b/kdeplasma-addons/applets/notes/CMakeLists.txt @@ -7,8 +7,7 @@ include_directories( ${KDE4_INCLUDES} ) -set(notes_SRCS notes.cpp textedit.cpp) -kde4_add_ui_files(notes_SRCS config.ui) +set(notes_SRCS notes.cpp textedit.cpp config.ui) kde4_add_plugin(plasma_applet_notes ${notes_SRCS}) target_link_libraries(plasma_applet_notes diff --git a/kdeplasma-addons/applets/paste/CMakeLists.txt b/kdeplasma-addons/applets/paste/CMakeLists.txt index 7c721324..81fd5d9c 100644 --- a/kdeplasma-addons/applets/paste/CMakeLists.txt +++ b/kdeplasma-addons/applets/paste/CMakeLists.txt @@ -10,9 +10,6 @@ set(paste_SRCS appkey.cpp pastemacroexpander.cpp addmacro.cpp -) - -kde4_add_ui_files(paste_SRCS list.ui snippetconfig.ui autopasteconfig.ui diff --git a/kdeplasma-addons/applets/pastebin/CMakeLists.txt b/kdeplasma-addons/applets/pastebin/CMakeLists.txt index 3814ddaf..80591fd5 100644 --- a/kdeplasma-addons/applets/pastebin/CMakeLists.txt +++ b/kdeplasma-addons/applets/pastebin/CMakeLists.txt @@ -1,9 +1,9 @@ project(plasma-pastebin) set(pastebin_SRCS - pastebin.cpp) - -kde4_add_ui_files(pastebin_SRCS pastebinConfig.ui) + pastebin.cpp + pastebinConfig.ui +) kde4_add_plugin(plasma_applet_pastebin ${pastebin_SRCS}) target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS}) diff --git a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt index 01749ab7..e98c9205 100644 --- a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt +++ b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt @@ -13,20 +13,35 @@ include_directories( ) # We add our source code here -set(plasmaboard_SRCS widget.cpp BoardKey.cpp PanelIcon.cpp AlphaNumKey.cpp - DualKey.cpp FuncKey.cpp EnterKey.cpp BackspaceKey.cpp TabKey.cpp - ShiftKey.cpp CapsKey.cpp ArrowTopKey.cpp ArrowBottomKey.cpp - ArrowLeftKey.cpp ArrowRightKey.cpp tooltip.cpp StickyKey.cpp - SwitchKey.cpp Layout.cpp) +set(plasmaboard_SRCS + widget.cpp + BoardKey.cpp + PanelIcon.cpp + AlphaNumKey.cpp + DualKey.cpp + FuncKey.cpp + EnterKey.cpp + BackspaceKey.cpp + TabKey.cpp + ShiftKey.cpp + CapsKey.cpp + ArrowTopKey.cpp + ArrowBottomKey.cpp + ArrowLeftKey.cpp + ArrowRightKey.cpp + tooltip.cpp + StickyKey.cpp + SwitchKey.cpp + Layout.cpp + config.ui +) if (Q_WS_X11) set(plasmaboard_SRCS ${plasmaboard_SRCS} Helpers_x11.cpp) elseif (Q_WS_X11) set(plasmaboard_SRCS ${plasmaboard_SRCS} Helpers_fake.cpp) endif (Q_WS_X11) - -kde4_add_ui_files(plasmaboard_SRCS config.ui) - + # Now make sure all files get to the right place kde4_add_plugin(plasma_applet_plasmaboard ${plasmaboard_SRCS}) target_link_libraries(plasma_applet_plasmaboard diff --git a/kdeplasma-addons/applets/rememberthemilk/CMakeLists.txt b/kdeplasma-addons/applets/rememberthemilk/CMakeLists.txt index 8e131270..dc6bb0c1 100644 --- a/kdeplasma-addons/applets/rememberthemilk/CMakeLists.txt +++ b/kdeplasma-addons/applets/rememberthemilk/CMakeLists.txt @@ -1,28 +1,29 @@ project(rememberthemilk-plasmoid) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDES} - ) + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${KDE4_INCLUDES} +) set(rememberthemilk-plasmoid_SRCS - rememberthemilk-plasmoid.cpp - taskitem.cpp - taskitemdelegate.cpp - taskeditor.cpp - taskmodel.cpp - tasksortfilter.cpp) - -kde4_add_ui_files(rememberthemilk-plasmoid_SRCS authenticate.ui general.ui) + rememberthemilk-plasmoid.cpp + taskitem.cpp + taskitemdelegate.cpp + taskeditor.cpp + taskmodel.cpp + tasksortfilter.cpp + authenticate.ui + general.ui +) kde4_add_plugin(plasma_applet_rtm ${rememberthemilk-plasmoid_SRCS}) target_link_libraries(plasma_applet_rtm - ${KDE4_PLASMA_LIBS} - ${KDE4_SOLID_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KDEWEBKIT_LIBS} - ) + ${KDE4_PLASMA_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} +) install(TARGETS plasma_applet_rtm DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kdeplasma-addons/applets/rssnow/CMakeLists.txt b/kdeplasma-addons/applets/rssnow/CMakeLists.txt index 72be1603..2622fd34 100644 --- a/kdeplasma-addons/applets/rssnow/CMakeLists.txt +++ b/kdeplasma-addons/applets/rssnow/CMakeLists.txt @@ -4,10 +4,10 @@ set(news_SRCS header.cpp single-feed.cpp scroller.cpp + config.ui + feedsConfig.ui ) -kde4_add_ui_files(news_SRCS config.ui feedsConfig.ui) - kde4_add_plugin(plasma_applet_rssnow ${news_SRCS}) target_link_libraries(plasma_applet_rssnow ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS}) @@ -15,7 +15,7 @@ install(TARGETS plasma_applet_rssnow DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-rssnow.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES feeds DESTINATION ${DATA_INSTALL_DIR}/rssnow) install(FILES -arrows.svgz -rssnow.svgz -background.svgz -DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/rssnow/) + arrows.svgz + rssnow.svgz + background.svgz + DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/rssnow/) diff --git a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt index 109b31b7..c8286199 100644 --- a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt +++ b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt @@ -1,21 +1,11 @@ project(systemloadviewer) -# building separately or as part of kdebase ? -if(NOT KDE4_FOUND) - find_package(KDE4 4.14.3 REQUIRED) - - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDES} - ) -endif(NOT KDE4_FOUND) - set(systemloadviewer_SRCS - systemloadviewer.cpp) - -#find_package(KDE4 4.14.3 REQUIRED) + systemloadviewer.cpp + generalconfig.ui + coloursconfig.ui +) -kde4_add_ui_files(systemloadviewer_SRCS generalconfig.ui coloursconfig.ui) kde4_add_plugin(plasma-applet_systemloadviewer ${systemloadviewer_SRCS}) target_link_libraries(plasma-applet_systemloadviewer ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/kdeplasma-addons/applets/timer/CMakeLists.txt b/kdeplasma-addons/applets/timer/CMakeLists.txt index d677506a..ced81b90 100644 --- a/kdeplasma-addons/applets/timer/CMakeLists.txt +++ b/kdeplasma-addons/applets/timer/CMakeLists.txt @@ -3,8 +3,13 @@ project(timer) # We add our source code here -set(timer_SRCS timer.cpp timerdigit.cpp customtimeeditor.cpp) -kde4_add_ui_files(timer_SRCS timerConfig.ui predefinedTimersConfig.ui) +set(timer_SRCS + timer.cpp + timerdigit.cpp + customtimeeditor.cpp + timerConfig.ui + predefinedTimersConfig.ui +) # Now make sure all files get to the right place kde4_add_plugin(plasma_applet_timer ${timer_SRCS}) diff --git a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt index 0ef27bcc..7b8a25dc 100644 --- a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt +++ b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt @@ -3,9 +3,6 @@ project(plasma-weatherstation) set(weatherstation_SRCS weatherstation.cpp lcd.cpp -) - -kde4_add_ui_files(weatherstation_SRCS appearanceconfig.ui ) diff --git a/kdeplasma-addons/applets/webslice/CMakeLists.txt b/kdeplasma-addons/applets/webslice/CMakeLists.txt index 0fff8591..49cf9a4c 100644 --- a/kdeplasma-addons/applets/webslice/CMakeLists.txt +++ b/kdeplasma-addons/applets/webslice/CMakeLists.txt @@ -2,15 +2,13 @@ project(webslice) include_directories( ${QT_INCLUDES} ) - - set(webslice_SRCS main.cpp kgraphicswebslice.cpp kwebslice.cpp ) -KDE4_ADD_EXECUTABLE(webslice ${webslice_SRCS}) +add_executable(webslice ${webslice_SRCS}) target_link_libraries(webslice ${QT_QTCORE_LIBRARY} diff --git a/kdeplasma-addons/applets/webslice/plasma/CMakeLists.txt b/kdeplasma-addons/applets/webslice/plasma/CMakeLists.txt index fad2b7d0..f2aa7382 100644 --- a/kdeplasma-addons/applets/webslice/plasma/CMakeLists.txt +++ b/kdeplasma-addons/applets/webslice/plasma/CMakeLists.txt @@ -5,14 +5,15 @@ include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} set(plasma-webslice_SRCS webslice.cpp ../kgraphicswebslice.cpp + websliceConfig.ui ) -kde4_add_ui_files(plasma-webslice_SRCS websliceConfig.ui ) kde4_add_plugin(plasma_applet_webslice ${plasma-webslice_SRCS}) target_link_libraries(plasma_applet_webslice - ${KDE4_PLASMA_LIBS} - ${KDE4_KIO_LIBS} - ${QT_QTWEBKIT_LIBRARY}) + ${KDE4_PLASMA_LIBS} + ${KDE4_KIO_LIBS} + ${QT_QTWEBKIT_LIBRARY} +) install(TARGETS plasma_applet_webslice DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-webslice.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt index 24ec7b43..11abcd46 100644 --- a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt +++ b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt @@ -1,30 +1,29 @@ set(groupingcontainment_SRCS - abstractgroup.cpp - groupinfo.cpp - groupfactory.cpp - groupingcontainment.cpp - handle.cpp - freehandle.cpp - gridhandle.cpp - spacer.cpp + abstractgroup.cpp + groupinfo.cpp + groupfactory.cpp + groupingcontainment.cpp + handle.cpp + freehandle.cpp + gridhandle.cpp + spacer.cpp - groups/floatinggroup.cpp - groups/gridgroup.cpp - groups/gridmanager.cpp - groups/flowgroup.cpp - groups/stackinggroup.cpp - groups/tabbinggroup.cpp - - groupexplorer/explorerwindow.cpp - groupexplorer/groupexplorer.cpp - groupexplorer/groupiconlist.cpp - groupexplorer/groupicon.cpp -) + groups/floatinggroup.cpp + groups/gridgroup.cpp + groups/gridmanager.cpp + groups/flowgroup.cpp + groups/stackinggroup.cpp + groups/tabbinggroup.cpp + groupexplorer/explorerwindow.cpp + groupexplorer/groupexplorer.cpp + groupexplorer/groupiconlist.cpp + groupexplorer/groupicon.cpp -kde4_add_ui_files(groupingcontainment_SRCS groups/tabbinggroup_config.ui) -kde4_add_library(plasma_groupingcontainment SHARED ${groupingcontainment_SRCS}) + groups/tabbinggroup_config.ui +) +add_library(plasma_groupingcontainment SHARED ${groupingcontainment_SRCS}) target_link_libraries(plasma_groupingcontainment ${KDE4_PLASMA_LIBS}) set_target_properties(plasma_groupingcontainment PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) diff --git a/kdeplasma-addons/dataengines/comic/CMakeLists.txt b/kdeplasma-addons/dataengines/comic/CMakeLists.txt index bd1e5311..ef6355e4 100644 --- a/kdeplasma-addons/dataengines/comic/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/comic/CMakeLists.txt @@ -16,7 +16,7 @@ set(comic_provider_core_SRCS comicprovider.cpp ) -kde4_add_library( plasmacomicprovidercore SHARED ${comic_provider_core_SRCS} ) +add_library( plasmacomicprovidercore SHARED ${comic_provider_core_SRCS} ) target_link_libraries( plasmacomicprovidercore PRIVATE ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KROSSCORE_LIBS} ) target_link_libraries( plasmacomicprovidercore PUBLIC ${KDE4_KDECORE_LIBS}) set_target_properties( diff --git a/kdeplasma-addons/dataengines/potd/CMakeLists.txt b/kdeplasma-addons/dataengines/potd/CMakeLists.txt index c5ade792..d5720107 100644 --- a/kdeplasma-addons/dataengines/potd/CMakeLists.txt +++ b/kdeplasma-addons/dataengines/potd/CMakeLists.txt @@ -16,7 +16,7 @@ set(potd_provider_core_SRCS potdprovider.cpp ) -kde4_add_library( plasmapotdprovidercore SHARED ${potd_provider_core_SRCS} ) +add_library( plasmapotdprovidercore SHARED ${potd_provider_core_SRCS} ) target_link_libraries( plasmapotdprovidercore ${KDE4_KDEUI_LIBS} ) set_target_properties( plasmapotdprovidercore PROPERTIES VERSION 1.0.0 SOVERSION 1 ) diff --git a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt index 7e3da4de..36e5610f 100644 --- a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt +++ b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt @@ -103,7 +103,7 @@ endif (NOT EXISTS ${kopete_xml}) qt4_add_dbus_interface(lancelot_datamodels_LIB_SRCS ${kopete_xml} kopete_interface) -kde4_add_library(lancelot-datamodels SHARED ${lancelot_datamodels_LIB_SRCS}) +add_library(lancelot-datamodels SHARED ${lancelot_datamodels_LIB_SRCS}) target_link_libraries( lancelot-datamodels diff --git a/kdeplasma-addons/libs/lancelot/CMakeLists.txt b/kdeplasma-addons/libs/lancelot/CMakeLists.txt index 8d85dbaa..8e34b7aa 100644 --- a/kdeplasma-addons/libs/lancelot/CMakeLists.txt +++ b/kdeplasma-addons/libs/lancelot/CMakeLists.txt @@ -81,7 +81,7 @@ set(lancelot_LIB_SRCS # models/PassagewayViewModels.cpp ) -kde4_add_library(lancelot SHARED ${lancelot_LIB_SRCS}) +add_library(lancelot SHARED ${lancelot_LIB_SRCS}) target_link_libraries( lancelot diff --git a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt index a9faa7b9..68ed9d4c 100644 --- a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt +++ b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt @@ -4,6 +4,7 @@ set(plasmaweather_LIB_SRCS weatherlocation.cpp weatherconfig.cpp weatheri18ncatalog.cpp + weatherconfig.ui ) set(plasmaweather_HEADERS @@ -14,11 +15,7 @@ set(plasmaweather_HEADERS plasmaweather_export.h ) -kde4_add_ui_files(plasmaweather_LIB_SRCS - weatherconfig.ui -) - -kde4_add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS}) +add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS}) target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${KDE4WORKSPACE_WEATHERION_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS}) set_target_properties(plasmaweather PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) diff --git a/kdeplasma-addons/libs/rtm/CMakeLists.txt b/kdeplasma-addons/libs/rtm/CMakeLists.txt index 6576082d..0cdb33fe 100644 --- a/kdeplasma-addons/libs/rtm/CMakeLists.txt +++ b/kdeplasma-addons/libs/rtm/CMakeLists.txt @@ -21,7 +21,7 @@ set( rtm_LIB_SRCS xmlreaders.cpp ) -kde4_add_library(rtm SHARED ${rtm_LIB_SRCS}) +add_library(rtm SHARED ${rtm_LIB_SRCS}) set_target_properties(rtm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) target_link_libraries(rtm ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} diff --git a/kdeplasma-addons/libs/rtm/tests/CMakeLists.txt b/kdeplasma-addons/libs/rtm/tests/CMakeLists.txt index ee2a843d..48eadbd7 100644 --- a/kdeplasma-addons/libs/rtm/tests/CMakeLists.txt +++ b/kdeplasma-addons/libs/rtm/tests/CMakeLists.txt @@ -1,12 +1,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) -kde4_add_executable(rtmlogin login.cpp) +add_executable(rtmlogin login.cpp) target_link_libraries(rtmlogin ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} rtm ${QT_QTSCRIPT_LIBRARY}) -#kde4_add_executable(rtmrefresh refresh.cpp) +#add_executable(rtmrefresh refresh.cpp) #target_link_libraries(rtmrefresh ${KDE4_KDEUI_LIBS} rtm ${QT_QTSCRIPT_LIBRARY}) diff --git a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt index 62a43dca..d30c2061 100644 --- a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt +++ b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt @@ -5,9 +5,9 @@ set(krunner_audioplayercontrol_SRCS set(kcm_krunner_audioplayercontrol_SRCS audioplayercontrolrunner_config.cpp + audioplayercontrolrunner_config.ui ) -kde4_add_ui_files(kcm_krunner_audioplayercontrol_SRCS audioplayercontrolrunner_config.ui) kde4_add_plugin(kcm_krunner_audioplayercontrol ${kcm_krunner_audioplayercontrol_SRCS}) target_link_libraries(kcm_krunner_audioplayercontrol ${KDE4_KDECORE_LIBS} diff --git a/kdeplasma-addons/runners/characters/CMakeLists.txt b/kdeplasma-addons/runners/characters/CMakeLists.txt index 15ebba9d..672c4beb 100644 --- a/kdeplasma-addons/runners/characters/CMakeLists.txt +++ b/kdeplasma-addons/runners/characters/CMakeLists.txt @@ -2,9 +2,10 @@ project(CharacterRunner) # We add our source code here set(krunner_charrunner_SRCS charrunner.cpp) -set(kcm_krunner_charrunner_SRCS charrunner_config.cpp) - -kde4_add_ui_files(kcm_krunner_charrunner_SRCS charrunner_config.ui) +set(kcm_krunner_charrunner_SRCS + charrunner_config.cpp + charrunner_config.ui +) kde4_add_plugin(kcm_krunner_charrunner ${kcm_krunner_charrunner_SRCS}) target_link_libraries(kcm_krunner_charrunner ${KDE4_KDECORE_LIBS} diff --git a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt index d3f8006a..9f773040 100644 --- a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt +++ b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt @@ -4,9 +4,9 @@ set(krunner_spellcheckrunner_SRCS set(kcm_krunner_spellcheck_SRCS spellcheck_config.cpp + spellcheck_config.ui ) -kde4_add_ui_files(kcm_krunner_spellcheck_SRCS spellcheck_config.ui) kde4_add_plugin(kcm_krunner_spellcheck ${kcm_krunner_spellcheck_SRCS}) target_link_libraries(kcm_krunner_spellcheck ${KDE4_KDECORE_LIBS} diff --git a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt index fc28ca6d..4b5a486c 100644 --- a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt @@ -9,10 +9,9 @@ set(pattern_SRCS backgrounddelegate.cpp backgroundlistmodel.cpp itemsview.cpp + config.ui ) -kde4_add_ui_files(pattern_SRCS config.ui) - kde4_add_plugin(plasma_wallpaper_pattern ${pattern_SRCS}) target_link_libraries(plasma_wallpaper_pattern ${QIMAGEBLITZ_LIBRARIES} ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS}) diff --git a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt index 3e5701b1..e0761caf 100644 --- a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt @@ -2,8 +2,8 @@ project(plasma-wallpaper-potd) set(potd_SRCS potd.cpp + config.ui ) -kde4_add_ui_files(potd_SRCS config.ui) kde4_add_plugin(plasma_wallpaper_potd ${potd_SRCS}) target_link_libraries(plasma_wallpaper_potd ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}) diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt index ba5b0f8e..f2124d78 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt @@ -1,8 +1,6 @@ project(plasma-wallpaper-qml) -kde4_add_ui_files(qmlwp_SRCS viewconfig.ui) - -kde4_add_plugin(plasma_wallpaper_qml wallpapersmodel.cpp wallpapersqml.cpp backgrounddelegate.cpp ${qmlwp_SRCS}) +kde4_add_plugin(plasma_wallpaper_qml wallpapersmodel.cpp wallpapersqml.cpp backgrounddelegate.cpp viewconfig.ui) target_link_libraries(plasma_wallpaper_qml ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} kdeclarative diff --git a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt index 44657d84..27eb12a4 100644 --- a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt @@ -7,8 +7,8 @@ set(virus_SRCS backgroundlistmodel.cpp alife.cpp itemsview.cpp + virusconfig.ui ) -kde4_add_ui_files(virus_SRCS virusconfig.ui) set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface) diff --git a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt index c3e2ae86..6f8241b9 100644 --- a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt +++ b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt @@ -4,10 +4,9 @@ set(weather_SRCS weatherwallpaper.cpp backgrounddelegate.cpp backgroundlistmodel.cpp + weatherAdvanced.ui ) -kde4_add_ui_files(weather_SRCS weatherAdvanced.ui) - kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS}) target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_THREADWEAVER_LIBRARY} plasmaweather) diff --git a/kdevelop/app/CMakeLists.txt b/kdevelop/app/CMakeLists.txt index 8e422486..6133b5f0 100644 --- a/kdevelop/app/CMakeLists.txt +++ b/kdevelop/app/CMakeLists.txt @@ -18,7 +18,7 @@ else() kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png") endif(APPLE) -kde4_add_executable(kdevelop ${kdevelop_SRCS} ) +add_executable(kdevelop ${kdevelop_SRCS} ) target_link_libraries(kdevelop ${KDE4_KDECORE_LIBS} diff --git a/kdevelop/languages/cpp/cppduchain/CMakeLists.txt b/kdevelop/languages/cpp/cppduchain/CMakeLists.txt index 5e0eb3e4..2944b3ac 100644 --- a/kdevelop/languages/cpp/cppduchain/CMakeLists.txt +++ b/kdevelop/languages/cpp/cppduchain/CMakeLists.txt @@ -60,7 +60,7 @@ set(kdevcppduchain_LIB_SRCS # Its only purpose is to support the plugin without needing to add all source files # to the plugin target -kde4_add_library(kdev4cppduchain SHARED ${kdevcppduchain_LIB_SRCS}) +add_library(kdev4cppduchain SHARED ${kdevcppduchain_LIB_SRCS}) target_link_libraries(kdev4cppduchain LINK_PRIVATE ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_INTERFACES_LIBRARIES} diff --git a/kdevelop/languages/cpp/parser/CMakeLists.txt b/kdevelop/languages/cpp/parser/CMakeLists.txt index 81b1baf1..c1ecfb21 100644 --- a/kdevelop/languages/cpp/parser/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/CMakeLists.txt @@ -33,7 +33,7 @@ set(kdevcppparser_LIB_SRCS # Note: This library doesn't follow API/ABI/BC rules and shouldn't have a SOVERSION # Its only purpose is to support the plugin without needing to add all source files # to the plugin target -kde4_add_library(kdev4cppparser SHARED ${kdevcppparser_LIB_SRCS}) +add_library(kdev4cppparser SHARED ${kdevcppparser_LIB_SRCS}) target_link_libraries(kdev4cppparser LINK_PRIVATE ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDE4_KDECORE_LIBS} diff --git a/kdevelop/languages/cpp/parser/headergen/CMakeLists.txt b/kdevelop/languages/cpp/parser/headergen/CMakeLists.txt index 0e73f479..ed7aba30 100644 --- a/kdevelop/languages/cpp/parser/headergen/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/headergen/CMakeLists.txt @@ -5,5 +5,5 @@ set(headergen_SRCS main.cpp ) -kde4_add_executable(headergen TEST ${headergen_SRCS}) +add_executable(headergen TEST ${headergen_SRCS}) target_link_libraries(headergen ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4cpprpp kdev4cppparser) diff --git a/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt b/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt index e81ddcf5..7e08a578 100644 --- a/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt @@ -19,7 +19,7 @@ set(kdevcpprpp_LIB_SRCS # Note: This library doesn't follow API/ABI/BC rules and shouldn't have a SOVERSION # Its only purpose is to support the plugin without needing to add all source files # to the plugin target -kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS}) +add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS}) target_link_libraries(kdev4cpprpp LINK_PRIVATE ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} diff --git a/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt b/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt index ff54b658..c08e526d 100644 --- a/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt +++ b/kdevelop/languages/cpp/parser/rpp/tests/CMakeLists.txt @@ -8,6 +8,6 @@ set(pp_SRCS main.cpp ) -kde4_add_executable(pp TEST ${pp_SRCS}) +add_executable(pp TEST ${pp_SRCS}) target_link_libraries(pp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4cpprpp) diff --git a/kdevelop/languages/cpp/tests/CMakeLists.txt b/kdevelop/languages/cpp/tests/CMakeLists.txt index 68ba2337..14c8d2f9 100644 --- a/kdevelop/languages/cpp/tests/CMakeLists.txt +++ b/kdevelop/languages/cpp/tests/CMakeLists.txt @@ -160,7 +160,7 @@ target_link_libraries(cppcodegentest ${KDEVPLATFORM_TESTS_LIBRARIES} ) -kde4_add_executable( cpp-parser cpp-parser.cpp ) +add_executable( cpp-parser cpp-parser.cpp ) target_link_libraries(cpp-parser ${QT_QTCORE_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4cppparser kdev4cppduchain kdev4cpprpp) diff --git a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt index 76cd4664..32fc779c 100644 --- a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt +++ b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/CMakeLists.txt @@ -8,7 +8,7 @@ set( compilerprovider_SRCS ../debugarea.cpp ) -kde4_add_library( kdevcompilerprovider SHARED +add_library( kdevcompilerprovider SHARED ${compilerprovider_SRCS}) target_link_libraries( kdevcompilerprovider LINK_PRIVATE diff --git a/kdevelop/projectmanagers/cmake/CMakeLists.txt b/kdevelop/projectmanagers/cmake/CMakeLists.txt index 80b32a53..54c33eef 100644 --- a/kdevelop/projectmanagers/cmake/CMakeLists.txt +++ b/kdevelop/projectmanagers/cmake/CMakeLists.txt @@ -74,7 +74,7 @@ remove_definitions( -DQT_NO_STL ) # to the plugin target kde4_add_ui_files( cmakecommon_SRCS ${cmakecommon_UI} ) -kde4_add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} ) +add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} ) target_link_libraries( kdev4cmakecommon LINK_PRIVATE ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} diff --git a/kdevelop/projectmanagers/cmake/tests/CMakeLists.txt b/kdevelop/projectmanagers/cmake/tests/CMakeLists.txt index 5b780c38..fc530d53 100644 --- a/kdevelop/projectmanagers/cmake/tests/CMakeLists.txt +++ b/kdevelop/projectmanagers/cmake/tests/CMakeLists.txt @@ -25,5 +25,5 @@ kdevcmake_add_test(cmakemanagertest ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLA # kdevcmake_add_test(ctestfindsuitestest ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES}) # this is not a unit test but a testing tool, kept here for convenience -kde4_add_executable(kdevprojectopen kdevprojectopen.cpp) +add_executable(kdevprojectopen kdevprojectopen.cpp) target_link_libraries(kdevprojectopen ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} kdev4cmakecommon) diff --git a/kdevelop/projectmanagers/cmake/tests/manual/kde4app/CMakeLists.txt b/kdevelop/projectmanagers/cmake/tests/manual/kde4app/CMakeLists.txt index 2a900002..cb271f8e 100644 --- a/kdevelop/projectmanagers/cmake/tests/manual/kde4app/CMakeLists.txt +++ b/kdevelop/projectmanagers/cmake/tests/manual/kde4app/CMakeLists.txt @@ -15,7 +15,7 @@ kde4_add_ui_files(kde4app_SRCS kde4appview_base.ui prefs_base.ui) kde4_add_kcfg_files(kde4app_SRCS settings.kcfgc ) -kde4_add_executable(kde4app ${kde4app_SRCS}) +add_executable(kde4app ${kde4app_SRCS}) target_link_libraries(kde4app ${KDE4_KDEUI_LIBS} ) diff --git a/kdevelop/projectmanagers/custom-buildsystem/tests/CMakeLists.txt b/kdevelop/projectmanagers/custom-buildsystem/tests/CMakeLists.txt index f569f4f4..01da4c45 100644 --- a/kdevelop/projectmanagers/custom-buildsystem/tests/CMakeLists.txt +++ b/kdevelop/projectmanagers/custom-buildsystem/tests/CMakeLists.txt @@ -25,5 +25,5 @@ kde4_add_ui_files( kcm_uitest_SRCS ../configwidget.ui ../custombuildsystemconfigwidget.ui ) -kde4_add_executable( kcm_uitest ${kcm_uitest_SRCS} ) +add_executable( kcm_uitest ${kcm_uitest_SRCS} ) target_link_libraries( kcm_uitest ${KDE4_KDEUI_LIBS} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} ) diff --git a/kdevplatform/debugger/CMakeLists.txt b/kdevplatform/debugger/CMakeLists.txt index bec440d1..4c3cbdf9 100644 --- a/kdevplatform/debugger/CMakeLists.txt +++ b/kdevplatform/debugger/CMakeLists.txt @@ -22,7 +22,7 @@ set( kdevplatformdebugger_LIB_SRCS framestack/framestackmodel.cpp framestack/framestackwidget.cpp ) -kde4_add_library(kdevplatformdebugger SHARED ${kdevplatformdebugger_LIB_SRCS}) +add_library(kdevplatformdebugger SHARED ${kdevplatformdebugger_LIB_SRCS}) target_link_libraries(kdevplatformdebugger LINK_PUBLIC kdevplatforminterfaces kdevplatformutil diff --git a/kdevplatform/documentation/CMakeLists.txt b/kdevplatform/documentation/CMakeLists.txt index 83c55c4d..1747cd51 100644 --- a/kdevplatform/documentation/CMakeLists.txt +++ b/kdevplatform/documentation/CMakeLists.txt @@ -5,10 +5,10 @@ set(kdevplatformdocumentation_LIB_SRCS standarddocumentationview.cpp documentationfindwidget.cpp documentationview.cpp + documentationfindwidget.ui ) -kde4_add_ui_files(kdevplatformdocumentation_LIB_SRCS documentationfindwidget.ui) -kde4_add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS}) +add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS}) install(TARGETS kdevplatformdocumentation EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/kdevplatform/interfaces/CMakeLists.txt b/kdevplatform/interfaces/CMakeLists.txt index fb060c4d..35054bba 100644 --- a/kdevplatform/interfaces/CMakeLists.txt +++ b/kdevplatform/interfaces/CMakeLists.txt @@ -1,7 +1,9 @@ find_package(Threads) find_library(RT_LIBRARY rt) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9502 ) set(kdevplatforminterfaces_LIB_SRCS @@ -51,7 +53,7 @@ set(kdevplatforminterfaces_LIB_SRCS ) configure_file(ipluginversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/ipluginversion.h) -kde4_add_library(kdevplatforminterfaces SHARED ${kdevplatforminterfaces_LIB_SRCS}) +add_library(kdevplatforminterfaces SHARED ${kdevplatforminterfaces_LIB_SRCS}) target_link_libraries(kdevplatforminterfaces LINK_PUBLIC ${KDE4_KPARTS_LIBS} ${KDE4_KTEXTEDITOR_LIBS} diff --git a/kdevplatform/language/CMakeLists.txt b/kdevplatform/language/CMakeLists.txt index bc962731..f434adb1 100644 --- a/kdevplatform/language/CMakeLists.txt +++ b/kdevplatform/language/CMakeLists.txt @@ -1,9 +1,11 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9505 ) -add_subdirectory(highlighting/tests) -add_subdirectory(duchain/tests) -add_subdirectory(backgroundparser/tests) -add_subdirectory(codegen/tests) +if(ENABLE_TESTING) + add_subdirectory(highlighting/tests) + add_subdirectory(duchain/tests) + add_subdirectory(backgroundparser/tests) + add_subdirectory(codegen/tests) +endif() set(kdevplatformlanguage_LIB_SRCS assistant/staticassistantsmanager.cpp @@ -147,13 +149,12 @@ set(kdevplatformlanguage_LIB_SRCS checks/dataaccessrepository.cpp checks/dataaccess.cpp checks/controlflowgraph.cpp checks/controlflownode.cpp -) -kde4_add_ui_files(kdevplatformlanguage_LIB_SRCS codegen/basicrefactoring.ui - codegen/progressdialogs/refactoringdialog.ui) + codegen/progressdialogs/refactoringdialog.ui +) -kde4_add_library(kdevplatformlanguage SHARED ${kdevplatformlanguage_LIB_SRCS}) +add_library(kdevplatformlanguage SHARED ${kdevplatformlanguage_LIB_SRCS}) target_link_libraries(kdevplatformlanguage LINK_PUBLIC kdevplatforminterfaces ) diff --git a/kdevplatform/outputview/CMakeLists.txt b/kdevplatform/outputview/CMakeLists.txt index b15d640f..22de5e49 100644 --- a/kdevplatform/outputview/CMakeLists.txt +++ b/kdevplatform/outputview/CMakeLists.txt @@ -12,7 +12,7 @@ set( outputviewinterfaces_LIB_SRCS outputjob.cpp outputexecutejob.cpp ) -kde4_add_library( kdevplatformoutputview SHARED ${outputviewinterfaces_LIB_SRCS} ) +add_library( kdevplatformoutputview SHARED ${outputviewinterfaces_LIB_SRCS} ) target_link_libraries(kdevplatformoutputview LINK_PUBLIC ${KDE4_KDEUI_LIBS} ) @@ -37,4 +37,6 @@ install(TARGETS kdevplatformoutputview EXPORT KDevPlatformTargets ${INSTALL_TARG outputexecutejob.h DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/outputview COMPONENT Devel) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevplatform/plugins/appwizard/CMakeLists.txt b/kdevplatform/plugins/appwizard/CMakeLists.txt index d2714ca7..379cf47f 100644 --- a/kdevplatform/plugins/appwizard/CMakeLists.txt +++ b/kdevplatform/plugins/appwizard/CMakeLists.txt @@ -10,15 +10,10 @@ set(kdevappwizard_PART_SRCS projectselectionpage.cpp projecttemplatesmodel.cpp projectvcspage.cpp -) - -set(kdevappwizard_PART_UI projectselectionpage.ui projectvcspage.ui ) -kde4_add_ui_files(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI}) - kde4_add_plugin(kdevappwizard ${kdevappwizard_PART_SRCS}) target_link_libraries(kdevappwizard ${KDE4_KDECORE_LIBS} diff --git a/kdevplatform/plugins/codeutils/CMakeLists.txt b/kdevplatform/plugins/codeutils/CMakeLists.txt index c5a06c4e..1bc5e69e 100644 --- a/kdevplatform/plugins/codeutils/CMakeLists.txt +++ b/kdevplatform/plugins/codeutils/CMakeLists.txt @@ -22,7 +22,9 @@ target_link_libraries(kdevcodeutils ) add_subdirectory(doc_templates) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() install(TARGETS kdevcodeutils DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdevplatform/plugins/cvs/CMakeLists.txt b/kdevplatform/plugins/cvs/CMakeLists.txt index dbc3af7f..aa929321 100644 --- a/kdevplatform/plugins/cvs/CMakeLists.txt +++ b/kdevplatform/plugins/cvs/CMakeLists.txt @@ -1,8 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9513 ) -add_subdirectory(tests) - +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### @@ -21,9 +22,6 @@ set(kdevcvs_PART_SRCS cvslogjob.cpp cvsdiffjob.cpp cvsstatusjob.cpp -) - -set(kdevcvs_PART_UI cvsmainview.ui cvsgenericoutputview.ui editorsview.ui @@ -32,7 +30,6 @@ set(kdevcvs_PART_UI checkoutdialog.ui ) -kde4_add_ui_files(kdevcvs_PART_SRCS ${kdevcvs_PART_UI}) kde4_add_plugin(kdevcvs ${kdevcvs_PART_SRCS}) target_link_libraries(kdevcvs diff --git a/kdevplatform/plugins/dashboard/CMakeLists.txt b/kdevplatform/plugins/dashboard/CMakeLists.txt index 4050024b..756cb69c 100644 --- a/kdevplatform/plugins/dashboard/CMakeLists.txt +++ b/kdevplatform/plugins/dashboard/CMakeLists.txt @@ -6,14 +6,14 @@ set(kdevprojectdasboard_SRCS appletselector.cpp dashboard.cpp dashboardcorona.cpp - dashboardview.cpp dashboarddocument.cpp dashboardpluginloader.cpp dashboarddataengine.cpp - kdevprojectdashboard.cpp) + kdevprojectdashboard.cpp + appletselector.ui +) -kde4_add_ui_files(kdevprojectdasboard_SRCS appletselector.ui) kde4_add_plugin(kdevprojectdashboard ${kdevprojectdasboard_SRCS}) target_link_libraries(kdevprojectdashboard ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} ${KDEVPLATFORM_SUBLIME_LIBRARIES}) diff --git a/kdevplatform/plugins/dashboard/declarative/CMakeLists.txt b/kdevplatform/plugins/dashboard/declarative/CMakeLists.txt index 0d5cfa40..18b195fe 100644 --- a/kdevplatform/plugins/dashboard/declarative/CMakeLists.txt +++ b/kdevplatform/plugins/dashboard/declarative/CMakeLists.txt @@ -2,7 +2,7 @@ project(kdevelop-declarative) include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) -kde4_add_library(kdevelopdashboarddeclarativeplugin SHARED kdevelopdashboarddeclarativeplugin.cpp icoreobject.cpp) +add_library(kdevelopdashboarddeclarativeplugin SHARED kdevelopdashboarddeclarativeplugin.cpp icoreobject.cpp) target_link_libraries(kdevelopdashboarddeclarativeplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} diff --git a/kdevplatform/plugins/dashboard/plasmoids/projectfileplasmoid/CMakeLists.txt b/kdevplatform/plugins/dashboard/plasmoids/projectfileplasmoid/CMakeLists.txt index d3016d73..23bd8632 100644 --- a/kdevplatform/plugins/dashboard/plasmoids/projectfileplasmoid/CMakeLists.txt +++ b/kdevplatform/plugins/dashboard/plasmoids/projectfileplasmoid/CMakeLists.txt @@ -1,9 +1,7 @@ project(projectitemelement) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -set(projectfileelement_SRCS projectfileelement.cpp) - -kde4_add_ui_files(projectfileelement_SRCS config.ui) +set(projectfileelement_SRCS projectfileelement.cpp config.ui) kde4_add_plugin(plasma_kdev_projectfileelement ${projectfileelement_SRCS}) target_link_libraries(plasma_kdev_projectfileelement ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/kdevplatform/plugins/execute/CMakeLists.txt b/kdevplatform/plugins/execute/CMakeLists.txt index 5313b7b8..99829147 100644 --- a/kdevplatform/plugins/execute/CMakeLists.txt +++ b/kdevplatform/plugins/execute/CMakeLists.txt @@ -3,19 +3,14 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9515 ) ########### next target ############### -set(kdevexecute_PART_UIS - nativeappconfig.ui -) - set(kdevexecute_PART_SRCS - projecttargetscombobox.cpp executeplugin.cpp nativeappconfig.cpp nativeappjob.cpp + nativeappconfig.ui ) -kde4_add_ui_files( kdevexecute_PART_SRCS ${kdevexecute_PART_UIS} ) kde4_add_plugin(kdevexecute ${kdevexecute_PART_SRCS} ) target_link_libraries(kdevexecute ${KDE4_KDEUI_LIBS} diff --git a/kdevplatform/plugins/executescript/CMakeLists.txt b/kdevplatform/plugins/executescript/CMakeLists.txt index bcd7d412..3d5bff26 100644 --- a/kdevplatform/plugins/executescript/CMakeLists.txt +++ b/kdevplatform/plugins/executescript/CMakeLists.txt @@ -11,17 +11,13 @@ include_directories( ########### next target ############### -set(kdevexecutescript_PART_UIS - scriptappconfig.ui -) - set(kdevexecutescript_PART_SRCS executescriptplugin.cpp scriptappconfig.cpp scriptappjob.cpp + scriptappconfig.ui ) -kde4_add_ui_files( kdevexecutescript_PART_SRCS ${kdevexecutescript_PART_UIS} ) kde4_add_plugin(kdevexecutescript ${kdevexecutescript_PART_SRCS} ) target_link_libraries(kdevexecutescript ${KDE4_KDEUI_LIBS} diff --git a/kdevplatform/plugins/externalscript/CMakeLists.txt b/kdevplatform/plugins/externalscript/CMakeLists.txt index 90afcfa7..8c059f1d 100644 --- a/kdevplatform/plugins/externalscript/CMakeLists.txt +++ b/kdevplatform/plugins/externalscript/CMakeLists.txt @@ -7,15 +7,10 @@ set(kdevexternalscript_PART_SRCS externalscriptjob.cpp editexternalscript.cpp externalscriptdebug.cpp -) - -set(kdevexternalscript_PART_UI externalscriptview.ui editexternalscript.ui ) -kde4_add_ui_files(kdevexternalscript_PART_SRCS ${kdevexternalscript_PART_UI}) - kde4_add_plugin(kdevexternalscript ${kdevexternalscript_PART_SRCS}) target_link_libraries(kdevexternalscript diff --git a/kdevplatform/plugins/filetemplates/CMakeLists.txt b/kdevplatform/plugins/filetemplates/CMakeLists.txt index f9a16ecc..e28118ed 100644 --- a/kdevplatform/plugins/filetemplates/CMakeLists.txt +++ b/kdevplatform/plugins/filetemplates/CMakeLists.txt @@ -13,16 +13,14 @@ set(kdevfiletemplates_PART_SRCS templateoptionspage.cpp templateselectionpage.cpp testcasespage.cpp -) -kde4_add_ui_files(kdevfiletemplates_PART_SRCS templatepreviewtoolview.ui - ui/licensechooser.ui - ui/newclass.ui - ui/outputlocation.ui - ui/overridevirtuals.ui - ui/templateselection.ui - ui/testcases.ui + licensechooser.ui + newclass.ui + outputlocation.ui + overridevirtuals.ui + templateselection.ui + testcases.ui ) kde4_add_plugin(kdevfiletemplates ${kdevfiletemplates_PART_SRCS}) @@ -80,7 +78,7 @@ main.cpp testcasespage.cpp ) -kde4_add_executable(testfiletemplates ${test_srcs}) +add_executable(testfiletemplates ${test_srcs}) target_link_libraries(testfiletemplates ${KDE4_KDECORE_LIBS} diff --git a/kdevplatform/plugins/filetemplates/ui/licensechooser.ui b/kdevplatform/plugins/filetemplates/licensechooser.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/licensechooser.ui rename to kdevplatform/plugins/filetemplates/licensechooser.ui diff --git a/kdevplatform/plugins/filetemplates/ui/newclass.ui b/kdevplatform/plugins/filetemplates/newclass.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/newclass.ui rename to kdevplatform/plugins/filetemplates/newclass.ui diff --git a/kdevplatform/plugins/filetemplates/ui/outputlocation.ui b/kdevplatform/plugins/filetemplates/outputlocation.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/outputlocation.ui rename to kdevplatform/plugins/filetemplates/outputlocation.ui diff --git a/kdevplatform/plugins/filetemplates/ui/overridevirtuals.ui b/kdevplatform/plugins/filetemplates/overridevirtuals.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/overridevirtuals.ui rename to kdevplatform/plugins/filetemplates/overridevirtuals.ui diff --git a/kdevplatform/plugins/filetemplates/ui/templateselection.ui b/kdevplatform/plugins/filetemplates/templateselection.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/templateselection.ui rename to kdevplatform/plugins/filetemplates/templateselection.ui diff --git a/kdevplatform/plugins/filetemplates/ui/testcases.ui b/kdevplatform/plugins/filetemplates/testcases.ui similarity index 100% rename from kdevplatform/plugins/filetemplates/ui/testcases.ui rename to kdevplatform/plugins/filetemplates/testcases.ui diff --git a/kdevplatform/plugins/genericprojectmanager/CMakeLists.txt b/kdevplatform/plugins/genericprojectmanager/CMakeLists.txt index 7a7cce9e..65f6c910 100644 --- a/kdevplatform/plugins/genericprojectmanager/CMakeLists.txt +++ b/kdevplatform/plugins/genericprojectmanager/CMakeLists.txt @@ -1,7 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9517 ) -add_subdirectory(test) +if(ENABLE_TESTING) + add_subdirectory(test) +endif() ########### next target ############### diff --git a/kdevplatform/plugins/git/CMakeLists.txt b/kdevplatform/plugins/git/CMakeLists.txt index 90215dd8..01e506a7 100644 --- a/kdevplatform/plugins/git/CMakeLists.txt +++ b/kdevplatform/plugins/git/CMakeLists.txt @@ -4,7 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${git_SOURCE_DIR}/cmake) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=9525) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(icons) set(kdevgit_PART_SRCS @@ -15,9 +17,9 @@ set(kdevgit_PART_SRCS gitplugin.cpp gitjob.cpp gitplugincheckinrepositoryjob.cpp + stashmanagerdialog.ui ) -kde4_add_ui_files(kdevgit_PART_SRCS stashmanagerdialog.ui) kde4_add_plugin(kdevgit ${kdevgit_PART_SRCS}) target_link_libraries(kdevgit diff --git a/kdevplatform/plugins/git/tests/CMakeLists.txt b/kdevplatform/plugins/git/tests/CMakeLists.txt index 1cd17a5b..b635df7d 100644 --- a/kdevplatform/plugins/git/tests/CMakeLists.txt +++ b/kdevplatform/plugins/git/tests/CMakeLists.txt @@ -14,9 +14,9 @@ if (GIT_FOUND) ../gitjob.cpp ../gitmessagehighlighter.cpp ../gitplugincheckinrepositoryjob.cpp + ./stashmanagerdialog.ui ) - kde4_add_ui_files(gittest_SRCS ../stashmanagerdialog.ui) - kde4_add_unit_test(kdevgit-test ${gittest_SRCS}) + kde4_add_test(kdevgit-test ${gittest_SRCS}) target_link_libraries(kdevgit-test ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} diff --git a/kdevplatform/plugins/grepview/CMakeLists.txt b/kdevplatform/plugins/grepview/CMakeLists.txt index 0a630833..9d60ab91 100644 --- a/kdevplatform/plugins/grepview/CMakeLists.txt +++ b/kdevplatform/plugins/grepview/CMakeLists.txt @@ -1,7 +1,6 @@ project(grepview) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9001 ) - ########### next target ############### set(kdevgrepview_PART_SRCS @@ -13,14 +12,10 @@ set(kdevgrepview_PART_SRCS grepfindthread.cpp grepoutputview.cpp greputil.cpp -) - -set(kdevgrepview_PART_UI grepwidget.ui grepoutputview.ui ) -kde4_add_ui_files(kdevgrepview_PART_SRCS ${kdevgrepview_PART_UI}) kde4_add_plugin(kdevgrepview ${kdevgrepview_PART_SRCS}) target_link_libraries(kdevgrepview ${KDE4_KDECORE_LIBS} @@ -43,4 +38,6 @@ configure_file(kdevgrepview.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevgrepvi install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevplatform/plugins/patchreview/CMakeLists.txt b/kdevplatform/plugins/patchreview/CMakeLists.txt index 4f8d919d..02452a51 100644 --- a/kdevplatform/plugins/patchreview/CMakeLists.txt +++ b/kdevplatform/plugins/patchreview/CMakeLists.txt @@ -26,11 +26,10 @@ set(patchreview_PART_SRCS libdiff2/diffparser.cpp libdiff2/perforceparser.cpp libdiff2/stringlistpair.cpp + patchreview.ui + localpatchwidget.ui ) -kde4_add_ui_files(patchreview_PART_SRCS patchreview.ui localpatchwidget.ui) - - kde4_add_plugin(kdevpatchreview ${patchreview_PART_SRCS}) target_link_libraries(kdevpatchreview ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KPARTS_LIBS} kdevplatforminterfaces kdevplatformutil kdevplatformlanguage ${KDEVPLATFORM_VCS_LIBRARIES} sublime) diff --git a/kdevplatform/plugins/patchreview/libdiff2/CMakeLists.txt b/kdevplatform/plugins/patchreview/libdiff2/CMakeLists.txt index 88c05163..895c158c 100644 --- a/kdevplatform/plugins/patchreview/libdiff2/CMakeLists.txt +++ b/kdevplatform/plugins/patchreview/libdiff2/CMakeLists.txt @@ -1 +1,3 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevplatform/plugins/projectfilter/CMakeLists.txt b/kdevplatform/plugins/projectfilter/CMakeLists.txt index 8e5d0b95..ac6d5964 100644 --- a/kdevplatform/plugins/projectfilter/CMakeLists.txt +++ b/kdevplatform/plugins/projectfilter/CMakeLists.txt @@ -29,13 +29,9 @@ set( projectfilterkcm_SRCS filter.cpp filtermodel.cpp comboboxdelegate.cpp -) - -set( projectfilterkcm_UI projectfiltersettings.ui ) -kde4_add_ui_files( projectfilterkcm_SRCS ${projectfilterkcm_UI} ) kde4_add_kcfg_files( projectfilterkcm_SRCS projectfiltersettings.kcfgc ) kde4_add_plugin( kcm_kdevprojectfilter ${projectfilterkcm_SRCS} ) target_link_libraries( kcm_kdevprojectfilter @@ -45,4 +41,6 @@ target_link_libraries( kcm_kdevprojectfilter install( TARGETS kcm_kdevprojectfilter DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES kcm_kdevprojectfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdevplatform/plugins/projectmanagerview/CMakeLists.txt b/kdevplatform/plugins/projectmanagerview/CMakeLists.txt index 1fc4ad9c..1b24f27d 100644 --- a/kdevplatform/plugins/projectmanagerview/CMakeLists.txt +++ b/kdevplatform/plugins/projectmanagerview/CMakeLists.txt @@ -11,10 +11,10 @@ set(kdevprojectmanagerview_PLUGIN_SRCS projectbuildsetwidget.cpp vcsoverlayproxymodel.cpp projectmodelitemdelegate.cpp + projectbuildsetwidget.ui + projectmanagerview.ui ) -kde4_add_ui_files( kdevprojectmanagerview_PLUGIN_SRCS projectbuildsetwidget.ui projectmanagerview.ui ) - kde4_add_plugin(kdevprojectmanagerview ${kdevprojectmanagerview_PLUGIN_SRCS}) target_link_libraries(kdevprojectmanagerview ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdevplatforminterfaces kdevplatformproject kdevplatformlanguage kdevplatformutil sublime ${KDE4_THREADWEAVER_LIBRARIES} ) diff --git a/kdevplatform/plugins/quickopen/CMakeLists.txt b/kdevplatform/plugins/quickopen/CMakeLists.txt index 5fcaaf9c..7f8253b4 100644 --- a/kdevplatform/plugins/quickopen/CMakeLists.txt +++ b/kdevplatform/plugins/quickopen/CMakeLists.txt @@ -1,7 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9520 ) -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### @@ -16,14 +18,9 @@ set(kdevquickopen_PART_SRCS expandingtree/expandingdelegate.cpp expandingtree/expandingtree.cpp expandingtree/expandingwidgetmodel.cpp -) - -set ( - kdevquickopen_UI quickopen.ui ) -kde4_add_ui_files(kdevquickopen_PART_SRCS ${kdevquickopen_UI}) kde4_add_plugin(kdevquickopen ${kdevquickopen_PART_SRCS}) target_link_libraries(kdevquickopen kdevplatformlanguage kdevplatforminterfaces kdevplatformproject ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdevplatformutil) diff --git a/kdevplatform/plugins/quickopen/tests/CMakeLists.txt b/kdevplatform/plugins/quickopen/tests/CMakeLists.txt index e967c79d..66b69f9d 100644 --- a/kdevplatform/plugins/quickopen/tests/CMakeLists.txt +++ b/kdevplatform/plugins/quickopen/tests/CMakeLists.txt @@ -3,7 +3,7 @@ set(quickopentestbase_SRCS ../projectfilequickopen.cpp ) -kde4_add_library(quickopentestbase ${quickopentestbase_SRCS}) +add_library(quickopentestbase ${quickopentestbase_SRCS}) target_link_libraries(quickopentestbase ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} diff --git a/kdevplatform/plugins/reviewboard/CMakeLists.txt b/kdevplatform/plugins/reviewboard/CMakeLists.txt index 69329ece..b647bd3e 100644 --- a/kdevplatform/plugins/reviewboard/CMakeLists.txt +++ b/kdevplatform/plugins/reviewboard/CMakeLists.txt @@ -1,14 +1,16 @@ include_directories(${QJSON_INCLUDE_DIR}) add_subdirectory(icons) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(kdevreviewboard_PART_SRCS reviewboardplugin.cpp reviewpatchdialog.cpp reviewboardjobs.cpp + reviewpatch.ui ) -kde4_add_ui_files(kdevreviewboard_PART_SRCS reviewpatch.ui) kde4_add_plugin(kdevreviewboard ${kdevreviewboard_PART_SRCS}) target_link_libraries(kdevreviewboard ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${QJSON_LIBRARIES}) diff --git a/kdevplatform/plugins/reviewboard/tests/CMakeLists.txt b/kdevplatform/plugins/reviewboard/tests/CMakeLists.txt index 3ec4d42c..efa80669 100644 --- a/kdevplatform/plugins/reviewboard/tests/CMakeLists.txt +++ b/kdevplatform/plugins/reviewboard/tests/CMakeLists.txt @@ -8,7 +8,7 @@ set(reviewboardtest_SRCS kde4_add_ui_files(reviewboardtest_SRCS ../reviewpatch.ui) -kde4_add_executable(reviewboardtest ${reviewboardtest_SRCS}) +add_executable(reviewboardtest ${reviewboardtest_SRCS}) target_link_libraries(reviewboardtest ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QJSON_LIBRARIES}) diff --git a/kdevplatform/plugins/snippet/CMakeLists.txt b/kdevplatform/plugins/snippet/CMakeLists.txt index e90d0ea6..a52b0b24 100644 --- a/kdevplatform/plugins/snippet/CMakeLists.txt +++ b/kdevplatform/plugins/snippet/CMakeLists.txt @@ -15,14 +15,11 @@ set(kdevsnippet_PART_SRCS legacy/snippet.cpp legacy/editrepository.cpp legacy/editsnippet.cpp -) -set(kdevsnippet_PART_UI legacy/snippetview.ui legacy/editrepository.ui legacy/editsnippet.ui ) -kde4_add_ui_files(kdevsnippet_PART_SRCS ${kdevsnippet_PART_UI}) kde4_add_plugin(kdevsnippet ${kdevsnippet_PART_SRCS}) target_link_libraries(kdevsnippet ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} kdevplatformlanguage kdevplatforminterfaces) diff --git a/kdevplatform/plugins/standardoutputview/CMakeLists.txt b/kdevplatform/plugins/standardoutputview/CMakeLists.txt index 88c0478f..c95b03f1 100644 --- a/kdevplatform/plugins/standardoutputview/CMakeLists.txt +++ b/kdevplatform/plugins/standardoutputview/CMakeLists.txt @@ -1,7 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9522 ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### diff --git a/kdevplatform/plugins/subversion/CMakeLists.txt b/kdevplatform/plugins/subversion/CMakeLists.txt index 70359fa4..ff5092fc 100644 --- a/kdevplatform/plugins/subversion/CMakeLists.txt +++ b/kdevplatform/plugins/subversion/CMakeLists.txt @@ -1,7 +1,9 @@ project(KDevSubversionPlugin) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(icons) add_definitions( ${KDE4_ENABLE_EXCEPTIONS} -DKDE_DEFAULT_DEBUG_AREA=9510 ) @@ -72,15 +74,11 @@ set(kdevsubversion_PART_SRCS svncheckoutmetadatawidget.cpp svnclient.cpp svnlocationwidget.cpp + ssltrustdialog.ui + importmetadatawidget.ui + checkoutmetadatawidget.ui ) -set(kdevsubversion_PART_UI - ui/ssltrustdialog.ui - ui/importmetadatawidget.ui - ui/checkoutmetadatawidget.ui -) - -kde4_add_ui_files(kdevsubversion_PART_SRCS ${kdevsubversion_PART_UI}) kde4_add_plugin(kdevsubversion ${kdevsubversion_PART_SRCS} ${kdevsubversion_JOB_SRCS} ${kdevsubversion_WRAPPER_SRCS}) target_link_libraries(kdevsubversion diff --git a/kdevplatform/plugins/subversion/ui/blameoptiondlg.ui b/kdevplatform/plugins/subversion/blameoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/blameoptiondlg.ui rename to kdevplatform/plugins/subversion/blameoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/catoptiondlg.ui b/kdevplatform/plugins/subversion/catoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/catoptiondlg.ui rename to kdevplatform/plugins/subversion/catoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/checkoutmetadatawidget.ui b/kdevplatform/plugins/subversion/checkoutmetadatawidget.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/checkoutmetadatawidget.ui rename to kdevplatform/plugins/subversion/checkoutmetadatawidget.ui diff --git a/kdevplatform/plugins/subversion/ui/commitloginputdlg.ui b/kdevplatform/plugins/subversion/commitloginputdlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/commitloginputdlg.ui rename to kdevplatform/plugins/subversion/commitloginputdlg.ui diff --git a/kdevplatform/plugins/subversion/ui/copyoptiondlg.ui b/kdevplatform/plugins/subversion/copyoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/copyoptiondlg.ui rename to kdevplatform/plugins/subversion/copyoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/diffoptiondlg.ui b/kdevplatform/plugins/subversion/diffoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/diffoptiondlg.ui rename to kdevplatform/plugins/subversion/diffoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/importmetadatawidget.ui b/kdevplatform/plugins/subversion/importmetadatawidget.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/importmetadatawidget.ui rename to kdevplatform/plugins/subversion/importmetadatawidget.ui diff --git a/kdevplatform/plugins/subversion/ui/logviewoptiondlg.ui b/kdevplatform/plugins/subversion/logviewoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/logviewoptiondlg.ui rename to kdevplatform/plugins/subversion/logviewoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/moveoptiondlg.ui b/kdevplatform/plugins/subversion/moveoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/moveoptiondlg.ui rename to kdevplatform/plugins/subversion/moveoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/revertoptiondlg.ui b/kdevplatform/plugins/subversion/revertoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/revertoptiondlg.ui rename to kdevplatform/plugins/subversion/revertoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/revisionwidget.ui b/kdevplatform/plugins/subversion/revisionwidget.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/revisionwidget.ui rename to kdevplatform/plugins/subversion/revisionwidget.ui diff --git a/kdevplatform/plugins/subversion/ui/ssltrustdialog.ui b/kdevplatform/plugins/subversion/ssltrustdialog.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/ssltrustdialog.ui rename to kdevplatform/plugins/subversion/ssltrustdialog.ui diff --git a/kdevplatform/plugins/subversion/ui/statusoptiondlg.ui b/kdevplatform/plugins/subversion/statusoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/statusoptiondlg.ui rename to kdevplatform/plugins/subversion/statusoptiondlg.ui diff --git a/kdevplatform/plugins/subversion/ui/updateoptiondlg.ui b/kdevplatform/plugins/subversion/updateoptiondlg.ui similarity index 100% rename from kdevplatform/plugins/subversion/ui/updateoptiondlg.ui rename to kdevplatform/plugins/subversion/updateoptiondlg.ui diff --git a/kdevplatform/plugins/templatemanager/CMakeLists.txt b/kdevplatform/plugins/templatemanager/CMakeLists.txt index cc3ea92e..2bdcbfca 100644 --- a/kdevplatform/plugins/templatemanager/CMakeLists.txt +++ b/kdevplatform/plugins/templatemanager/CMakeLists.txt @@ -2,10 +2,10 @@ set(kdevtemplatemanager_config_SRCS templateconfig.cpp templatepage.cpp + templateconfig.ui + templatepage.ui ) -kde4_add_ui_files(kdevtemplatemanager_config_SRCS templateconfig.ui templatepage.ui) - kde4_add_plugin( kdevtemplatemanager_config ${kdevtemplatemanager_config_SRCS} ) target_link_libraries( kdevtemplatemanager_config ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} kdevplatforminterfaces) diff --git a/kdevplatform/project/CMakeLists.txt b/kdevplatform/project/CMakeLists.txt index 2e3ce8c1..efdea42e 100644 --- a/kdevplatform/project/CMakeLists.txt +++ b/kdevplatform/project/CMakeLists.txt @@ -20,7 +20,7 @@ set(kdevplatformproject_LIB_SRCS ) -kde4_add_library(kdevplatformproject SHARED ${kdevplatformproject_LIB_SRCS}) +add_library(kdevplatformproject SHARED ${kdevplatformproject_LIB_SRCS}) target_link_libraries(kdevplatformproject LINK_PUBLIC kdevplatforminterfaces ) @@ -33,7 +33,9 @@ target_link_libraries(kdevplatformproject LINK_PRIVATE set_target_properties(kdevplatformproject PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION}) install(TARGETS kdevplatformproject EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### install files ############### diff --git a/kdevplatform/project/tests/CMakeLists.txt b/kdevplatform/project/tests/CMakeLists.txt index b60b7ffa..e105696f 100644 --- a/kdevplatform/project/tests/CMakeLists.txt +++ b/kdevplatform/project/tests/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(projectmodeltest set( projectmodelperformancetest_SRCS projectmodelperformancetest.cpp ) -kde4_add_executable(projectmodelperformancetest ${projectmodelperformancetest_SRCS}) +add_executable(projectmodelperformancetest ${projectmodelperformancetest_SRCS}) target_link_libraries(projectmodelperformancetest ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} diff --git a/kdevplatform/shell/CMakeLists.txt b/kdevplatform/shell/CMakeLists.txt index 61205a6f..53a16a56 100644 --- a/kdevplatform/shell/CMakeLists.txt +++ b/kdevplatform/shell/CMakeLists.txt @@ -1,7 +1,9 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9501 ) add_subdirectory(settings) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(kdevplatformshell_LIB_SRCS workingsetcontroller.cpp @@ -56,6 +58,11 @@ set(kdevplatformshell_LIB_SRCS progresswidget/progressdialog.cpp areadisplay.cpp + + sessiondialog.ui + projectinfopage.ui + launchconfigurationdialog.ui + projectsourcepage.ui ) # Check if KTE is new enough to have the EditVIMode view mode flag @@ -66,15 +73,7 @@ if(HAVE_EDITVIMODE) add_definitions("-DKTEXTEDITOR_HAS_VIMODE=1") endif(HAVE_EDITVIMODE) -set(kdevplatformshell_UI - sessiondialog.ui - projectinfopage.ui - launchconfigurationdialog.ui - projectsourcepage.ui -) - -kde4_add_ui_files( kdevplatformshell_LIB_SRCS ${kdevplatformshell_UI} ) -kde4_add_library(kdevplatformshell SHARED ${kdevplatformshell_LIB_SRCS}) +add_library(kdevplatformshell SHARED ${kdevplatformshell_LIB_SRCS}) target_link_libraries(kdevplatformshell LINK_PUBLIC sublime kdevplatformoutputview diff --git a/kdevplatform/shell/settings/CMakeLists.txt b/kdevplatform/shell/settings/CMakeLists.txt index c66367f5..6b577692 100644 --- a/kdevplatform/shell/settings/CMakeLists.txt +++ b/kdevplatform/shell/settings/CMakeLists.txt @@ -14,13 +14,9 @@ target_link_libraries( kcm_kdev_pluginsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEU ########### UI settings set( uisettings_cfg_SRCS uipreferences.cpp -) - -set( uisettings_cfg_UI uiconfig.ui ) -kde4_add_ui_files( uisettings_cfg_SRCS ${uisettings_cfg_UI} ) kde4_add_kcfg_files( uisettings_cfg_SRCS uiconfig.kcfgc ) kde4_add_plugin( kcm_kdev_uisettings ${uisettings_cfg_SRCS} ) target_link_libraries( kcm_kdev_uisettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} kdevplatformshell sublime ) @@ -29,13 +25,9 @@ target_link_libraries( kcm_kdev_uisettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LI set( bgsettings_cfg_SRCS bgpreferences.cpp -) - -set( bgsettings_cfg_UI bgsettings.ui ) -kde4_add_ui_files( bgsettings_cfg_SRCS ${bgsettings_cfg_UI} ) kde4_add_kcfg_files( bgsettings_cfg_SRCS bgconfig.kcfgc ) kde4_add_plugin( kcm_kdev_bgsettings ${bgsettings_cfg_SRCS} ) target_link_libraries( kcm_kdev_bgsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} kdevplatformshell kdevplatformlanguage) @@ -44,13 +36,9 @@ target_link_libraries( kcm_kdev_bgsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LI set( ccsettings_cfg_SRCS ccpreferences.cpp -) - -set( ccsettings_cfg_UI ccsettings.ui ) -kde4_add_ui_files( ccsettings_cfg_SRCS ${ccsettings_cfg_UI} ) kde4_add_kcfg_files( ccsettings_cfg_SRCS ccconfig.kcfgc ) kde4_add_plugin( kcm_kdev_ccsettings ${ccsettings_cfg_SRCS} ) target_link_libraries( kcm_kdev_ccsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} kdevplatforminterfaces kdevplatformshell ${KDE4_KTEXTEDITOR_LIBS}) @@ -59,13 +47,9 @@ target_link_libraries( kcm_kdev_ccsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LI set( projectsettings_cfg_SRCS projectpreferences.cpp -) - -set( projectsettings_cfg_UI projectsettings.ui ) -kde4_add_ui_files( projectsettings_cfg_SRCS ${projectsettings_cfg_UI} ) kde4_add_kcfg_files( projectsettings_cfg_SRCS projectconfig.kcfgc ) kde4_add_plugin( kcm_kdev_projectsettings ${projectsettings_cfg_SRCS} ) target_link_libraries( kcm_kdev_projectsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kdevplatformshell) @@ -76,13 +60,9 @@ set( envsettings_cfg_SRCS environmentwidget.cpp environmentgroupmodel.cpp environmentpreferences.cpp -) - -set( envsettings_cfg_UI environmentwidget.ui ) -kde4_add_ui_files( envsettings_cfg_SRCS ${envsettings_cfg_UI} ) kde4_add_plugin( kcm_kdev_envsettings ${envsettings_cfg_SRCS} ) target_link_libraries( kcm_kdev_envsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} kdevplatformshell kdevplatformutil) @@ -90,14 +70,10 @@ target_link_libraries( kcm_kdev_envsettings ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_L set(kcm_kdevsourceformattersettings_SRCS editstyledialog.cpp sourceformattersettings.cpp -) - -set(kcm_kdevsourceformattersettings_UI editstyledialog.ui sourceformattersettings.ui ) -kde4_add_ui_files(kcm_kdevsourceformattersettings_SRCS ${kcm_kdevsourceformattersettings_UI} ) kde4_add_plugin(kcm_kdevsourceformattersettings ${kcm_kdevsourceformattersettings_SRCS}) target_link_libraries(kcm_kdevsourceformattersettings ${KDE4_KDEUI_LIBS} ${KDE4_KTEXTEDITOR_LIBS} diff --git a/kdevplatform/sublime/CMakeLists.txt b/kdevplatform/sublime/CMakeLists.txt index 49cbd7f4..2b197c9c 100644 --- a/kdevplatform/sublime/CMakeLists.txt +++ b/kdevplatform/sublime/CMakeLists.txt @@ -1,6 +1,8 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9504 ) add_subdirectory(examples) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### @@ -27,7 +29,7 @@ set(sublime_LIB_SRCS idealbuttonbarwidget.cpp ) -kde4_add_library(sublime SHARED ${sublime_LIB_SRCS}) +add_library(sublime SHARED ${sublime_LIB_SRCS}) target_link_libraries(sublime LINK_PRIVATE ${KDE4_KDEUI_LIBS} LINK_PUBLIC ${KDE4_KPARTS_LIBS}) diff --git a/kdevplatform/sublime/examples/CMakeLists.txt b/kdevplatform/sublime/examples/CMakeLists.txt index b172b3b3..86daae1a 100644 --- a/kdevplatform/sublime/examples/CMakeLists.txt +++ b/kdevplatform/sublime/examples/CMakeLists.txt @@ -5,7 +5,7 @@ set(example1_SRCS example1.cpp ) -kde4_add_executable(example1 ${example1_SRCS}) +add_executable(example1 ${example1_SRCS}) target_link_libraries(example1 ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime) ########### next target ############### @@ -15,5 +15,5 @@ set(example2_SRCS example2.cpp ) -kde4_add_executable(example2 ${example2_SRCS}) +add_executable(example2 ${example2_SRCS}) target_link_libraries(example2 ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime) diff --git a/kdevplatform/tests/CMakeLists.txt b/kdevplatform/tests/CMakeLists.txt index 36d74609..9f4d3e5c 100644 --- a/kdevplatform/tests/CMakeLists.txt +++ b/kdevplatform/tests/CMakeLists.txt @@ -15,7 +15,7 @@ set(kdevplatformtests_LIB_SRCS modeltest.cpp ) -kde4_add_library(kdevplatformtests SHARED ${kdevplatformtests_LIB_SRCS}) +add_library(kdevplatformtests SHARED ${kdevplatformtests_LIB_SRCS}) target_link_libraries(kdevplatformtests LINK_PUBLIC kdevplatformshell kdevplatformlanguage diff --git a/kdevplatform/tests/json/CMakeLists.txt b/kdevplatform/tests/json/CMakeLists.txt index e3a40bfe..de4d762a 100644 --- a/kdevplatform/tests/json/CMakeLists.txt +++ b/kdevplatform/tests/json/CMakeLists.txt @@ -6,7 +6,7 @@ set(kdevplatformjsontests_LIB_SRCS testsuite.cpp ) -kde4_add_library(kdevplatformjsontests SHARED ${kdevplatformjsontests_LIB_SRCS}) +add_library(kdevplatformjsontests SHARED ${kdevplatformjsontests_LIB_SRCS}) target_link_libraries(kdevplatformjsontests LINK_PRIVATE ${QJSON_LIBRARIES} diff --git a/kdevplatform/util/CMakeLists.txt b/kdevplatform/util/CMakeLists.txt index 480fc1b7..1e8788f0 100644 --- a/kdevplatform/util/CMakeLists.txt +++ b/kdevplatform/util/CMakeLists.txt @@ -23,22 +23,18 @@ set(kdevplatformutil_LIB_SRCS placeholderitemproxymodel.cpp projecttestjob.cpp path.cpp + # runoptions.ui ) -set (kdevplatformutil_LIB_UI - runoptions.ui -) - -if(NOT WIN32) - add_subdirectory(dbus_socket_transformer) -endif(NOT WIN32) +add_subdirectory(dbus_socket_transformer) add_subdirectory(duchainify) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() -kde4_add_ui_files(kdevplatformutil_LIB_SRCS ${kdevplatformutil_LIB_US}) -kde4_add_library(kdevplatformutil SHARED ${kdevplatformutil_LIB_SRCS}) +add_library(kdevplatformutil SHARED ${kdevplatformutil_LIB_SRCS}) target_link_libraries(kdevplatformutil LINK_PUBLIC ${KDE4_KDEUI_LIBS} ) diff --git a/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt b/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt index dc4a61da..8aa1acc5 100644 --- a/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt +++ b/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt @@ -14,5 +14,5 @@ if(HAVE_MSG_NOSIGNAL) add_definitions(-DHAVE_MSG_NOSIGNAL=1) endif(HAVE_MSG_NOSIGNAL) -kde4_add_executable(kdev_dbus_socket_transformer main.cpp) +add_executable(kdev_dbus_socket_transformer main.cpp) install(TARGETS kdev_dbus_socket_transformer ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/kdevplatform/util/duchainify/CMakeLists.txt b/kdevplatform/util/duchainify/CMakeLists.txt index 40d5144d..49fad245 100644 --- a/kdevplatform/util/duchainify/CMakeLists.txt +++ b/kdevplatform/util/duchainify/CMakeLists.txt @@ -1,5 +1,5 @@ -kde4_add_executable(duchainify main.cpp) +add_executable(duchainify main.cpp) target_link_libraries(duchainify ${QT_QTCORE_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} sublime kdevplatformutil kdevplatformoutputview kdevplatformshell kdevplatformtests) diff --git a/kdevplatform/util/ssh_client/CMakeLists.txt b/kdevplatform/util/ssh_client/CMakeLists.txt index d615ab67..7c539bab 100644 --- a/kdevplatform/util/ssh_client/CMakeLists.txt +++ b/kdevplatform/util/ssh_client/CMakeLists.txt @@ -1,6 +1,6 @@ project (kdevssh_client) set(kdevssh_client_SRCS main.cpp) -kde4_add_executable(kdevssh_client ${kdevssh_client_SRCS}) +add_executable(kdevssh_client ${kdevssh_client_SRCS}) target_link_libraries(kdevssh_client ${KDE4_KDEUI_LIBS} ssh2) install(TARGETS kdevssh_client ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kdevplatform/vcs/CMakeLists.txt b/kdevplatform/vcs/CMakeLists.txt index 15fccca0..03838c71 100644 --- a/kdevplatform/vcs/CMakeLists.txt +++ b/kdevplatform/vcs/CMakeLists.txt @@ -1,17 +1,11 @@ -add_subdirectory(dvcs/tests) -add_subdirectory(models/tests) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(dvcs/tests) + add_subdirectory(models/tests) + add_subdirectory(tests) +endif() add_definitions(-DKDE_DEFAULT_DEBUG_AREA=9509) -set(kdevplatformvcs_UIS - widgets/vcscommitdialog.ui - widgets/vcseventwidget.ui - widgets/vcsdiffwidget.ui - dvcs/ui/dvcsimportmetadatawidget.ui - dvcs/ui/branchmanager.ui -) - set(kdevplatformvcs_LIB_SRCS vcsjob.cpp vcsrevision.cpp @@ -43,10 +37,14 @@ set(kdevplatformvcs_LIB_SRCS dvcs/ui/revhistory/commitlogmodel.cpp interfaces/ibasicversioncontrol.cpp interfaces/icontentawareversioncontrol.cpp + widgets/vcscommitdialog.ui + widgets/vcseventwidget.ui + widgets/vcsdiffwidget.ui + dvcs/ui/dvcsimportmetadatawidget.ui + dvcs/ui/branchmanager.ui ) -kde4_add_ui_files(kdevplatformvcs_LIB_SRCS ${kdevplatformvcs_UIS}) -kde4_add_library(kdevplatformvcs SHARED ${kdevplatformvcs_LIB_SRCS}) +add_library(kdevplatformvcs SHARED ${kdevplatformvcs_LIB_SRCS}) target_link_libraries(kdevplatformvcs LINK_PUBLIC kdevplatformoutputview kdevplatforminterfaces diff --git a/kfilemetadata/CMakeLists.txt b/kfilemetadata/CMakeLists.txt index ea56e5a3..d7b76bd7 100644 --- a/kfilemetadata/CMakeLists.txt +++ b/kfilemetadata/CMakeLists.txt @@ -45,7 +45,9 @@ include_directories( ) add_subdirectory(src) -add_subdirectory(autotests) +if(ENABLE_TESTING) + add_subdirectory(autotests) +endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KFileMetaDataConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KFileMetaDataConfig.cmake @ONLY) diff --git a/kfilemetadata/src/CMakeLists.txt b/kfilemetadata/src/CMakeLists.txt index a66fa1c3..f8f1ced4 100644 --- a/kfilemetadata/src/CMakeLists.txt +++ b/kfilemetadata/src/CMakeLists.txt @@ -1,4 +1,4 @@ -kde4_add_library(kfilemetadata SHARED +add_library(kfilemetadata SHARED extractionresult.cpp extractorplugin.cpp extractorpluginmanager.cpp diff --git a/kfloppy/CMakeLists.txt b/kfloppy/CMakeLists.txt index e5b92005..cb7b3f7f 100644 --- a/kfloppy/CMakeLists.txt +++ b/kfloppy/CMakeLists.txt @@ -22,7 +22,7 @@ endif() set(kfloppy_SRCS main.cpp format.cpp floppy.cpp ) -kde4_add_executable(kfloppy ${kfloppy_SRCS}) +add_executable(kfloppy ${kfloppy_SRCS}) target_link_libraries(kfloppy ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} ) diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt index bea06cb8..696d233d 100644 --- a/kget/CMakeLists.txt +++ b/kget/CMakeLists.txt @@ -139,7 +139,7 @@ qt4_add_dbus_adaptor(kgetcore_SRCS dbus/org.kde.kget.transfer.xml dbus/dbustrans qt4_add_dbus_adaptor(kgetcore_SRCS dbus/org.kde.kget.verifier.xml dbus/dbusverifierwrapper.h DBusVerifierWrapper) -kde4_add_library(kgetcore SHARED ${kgetcore_SRCS}) +add_library(kgetcore SHARED ${kgetcore_SRCS}) target_link_libraries(kgetcore ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS}) @@ -209,11 +209,7 @@ set(kget_SRCS ${kget_adaptor_SRCS} ${kget_transfer_adaptor_SRCS} main.cpp extensions/webinterface/httpserver.cpp -) - -qt4_add_dbus_adaptor(kget_SRCS dbus/org.kde.kget.main.xml dbus/dbuskgetwrapper.h DBusKGetWrapper) -kde4_add_ui_files(kget_SRCS conf/dlgadvanced.ui conf/dlgappearance.ui conf/dlggroups.ui @@ -242,9 +238,9 @@ kde4_add_ui_files(kget_SRCS ui/signaturedlg.ui ) -kde4_add_app_icon(kget_SRCS "ui/icons/hi*-apps-kget.png") +qt4_add_dbus_adaptor(kget_SRCS dbus/org.kde.kget.main.xml dbus/dbuskgetwrapper.h DBusKGetWrapper) -kde4_add_executable(kget ${kget_SRCS}) +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}) if(QCA2_FOUND) diff --git a/kget/transfer-plugins/bittorrent/CMakeLists.txt b/kget/transfer-plugins/bittorrent/CMakeLists.txt index 80894ea2..f03a6951 100644 --- a/kget/transfer-plugins/bittorrent/CMakeLists.txt +++ b/kget/transfer-plugins/bittorrent/CMakeLists.txt @@ -32,15 +32,12 @@ set(kget_bittorrentfactory_PART_SRCS advanceddetails/trackermodel.cpp advanceddetails/webseedsmodel.cpp advanceddetails/webseedstab.cpp - ) - -kde4_add_ui_files(kget_bittorrentfactory_PART_SRCS btdetailswidgetfrm.ui scandlg.ui advanceddetails/chunkdownloadview.ui advanceddetails/trackerview.ui advanceddetails/webseedstab.ui - ) +) kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc) kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS}) @@ -52,11 +49,8 @@ install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR} ###Build KCM-Module set(kcm_kget_bittorrentfactory_PART_SRCS btsettingswidget.cpp - ) - -kde4_add_ui_files(kcm_kget_bittorrentfactory_PART_SRCS btsettingswidget.ui - ) +) kde4_add_kcfg_files(kcm_kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc) kde4_add_plugin(kcm_kget_bittorrentfactory ${kcm_kget_bittorrentfactory_PART_SRCS}) diff --git a/kget/transfer-plugins/checksumsearch/CMakeLists.txt b/kget/transfer-plugins/checksumsearch/CMakeLists.txt index d633f4e9..df253398 100644 --- a/kget/transfer-plugins/checksumsearch/CMakeLists.txt +++ b/kget/transfer-plugins/checksumsearch/CMakeLists.txt @@ -20,13 +20,10 @@ install(FILES kget_checksumsearchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_checksumsearchfactory_PART_SRCS -checksumsearch.cpp -dlgchecksumsearch.cpp -) - -kde4_add_ui_files(kcm_kget_checksumsearchfactory_PART_SRCS -checksumsearch.ui -checksumsearchadddlg.ui + checksumsearch.cpp + dlgchecksumsearch.cpp + checksumsearch.ui + checksumsearchadddlg.ui ) kde4_add_kcfg_files(kcm_kget_checksumsearchfactory_PART_SRCS checksumsearchsettings.kcfgc) diff --git a/kget/transfer-plugins/metalink/CMakeLists.txt b/kget/transfer-plugins/metalink/CMakeLists.txt index 081b09bd..8826e160 100644 --- a/kget/transfer-plugins/metalink/CMakeLists.txt +++ b/kget/transfer-plugins/metalink/CMakeLists.txt @@ -6,15 +6,12 @@ include_directories( ) set(kget_metalinkfactory_PART_SRCS - metalinkfactory.cpp - abstractmetalink.cpp - metalinkxml.cpp - metalinkhttp.cpp - fileselectiondlg.cpp - ../../ui/metalinkcreator/metalinker.cpp -) - -kde4_add_ui_files(kget_metalinkfactory_PART_SRCS + metalinkfactory.cpp + abstractmetalink.cpp + metalinkxml.cpp + metalinkhttp.cpp + fileselectiondlg.cpp + ../../ui/metalinkcreator/metalinker.cpp fileselection.ui ) @@ -30,11 +27,8 @@ install(FILES kget_metalinkfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_metalinkfactory_PART_SRCS -dlgmetalink.cpp -) - -kde4_add_ui_files(kcm_kget_metalinkfactory_PART_SRCS -dlgmetalink.ui + dlgmetalink.cpp + dlgmetalink.ui ) kde4_add_kcfg_files(kcm_kget_metalinkfactory_PART_SRCS metalinksettings.kcfgc) diff --git a/kget/transfer-plugins/mirrorsearch/CMakeLists.txt b/kget/transfer-plugins/mirrorsearch/CMakeLists.txt index 689b8155..bc95d730 100644 --- a/kget/transfer-plugins/mirrorsearch/CMakeLists.txt +++ b/kget/transfer-plugins/mirrorsearch/CMakeLists.txt @@ -3,9 +3,9 @@ include_directories( ) set(kget_mirrorsearchfactory_PART_SRCS - mirrors.cpp - mirrorsearchtransferdatasource.cpp - mirrorsearchfactory.cpp + mirrors.cpp + mirrorsearchtransferdatasource.cpp + mirrorsearchfactory.cpp ) kde4_add_kcfg_files(kget_mirrorsearchfactory_PART_SRCS mirrorsearchsettings.kcfgc) @@ -20,12 +20,9 @@ install(FILES kget_mirrorsearchfactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_mirrorsearchfactory_PART_SRCS - dlgmirrorsearch.cpp -) - -kde4_add_ui_files(kcm_kget_mirrorsearchfactory_PART_SRCS - dlgmirrorsearch.ui - dlgengineediting.ui + dlgmirrorsearch.cpp + dlgmirrorsearch.ui + dlgengineediting.ui ) kde4_add_kcfg_files(kcm_kget_mirrorsearchfactory_PART_SRCS mirrorsearchsettings.kcfgc) diff --git a/kget/transfer-plugins/multisegmentkio/CMakeLists.txt b/kget/transfer-plugins/multisegmentkio/CMakeLists.txt index b8ec5668..965c0b5a 100644 --- a/kget/transfer-plugins/multisegmentkio/CMakeLists.txt +++ b/kget/transfer-plugins/multisegmentkio/CMakeLists.txt @@ -22,9 +22,6 @@ install(FILES kget_multisegkiofactory.kcfg DESTINATION ${KCFG_INSTALL_DIR}) ###Build KCM-Module set(kcm_kget_multisegkiofactory_PART_SRCS dlgmultisegkio.cpp -) - -kde4_add_ui_files(kcm_kget_multisegkiofactory_PART_SRCS dlgmultisegkio.ui ) diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt index 8cf5666f..f17c0668 100644 --- a/kgpg/CMakeLists.txt +++ b/kgpg/CMakeLists.txt @@ -94,41 +94,34 @@ set(kgpg_transaction_SRCS ) set(kgpg_SRCS ${core_SRCS} ${kgpg_editor_SRCS} ${kgpg_model_SRCS} ${kgpg_transaction_SRCS} - selectpublickeydialog.cpp - selectsecretkey.cpp - kgpgoptions.cpp - keysmanager.cpp - kgpg.cpp - main.cpp - kgpgkeygenerate.cpp - kgpginterface.cpp - kgpgtextinterface.cpp - gpgproc.cpp - klinebufferedprocess.cpp - keyservers.cpp - detailedconsole.cpp - keyinfodialog.cpp - newkey.cpp - keyexport.cpp - conf_encryption.cpp - kgpgrevokewidget.cpp - keytreeview.cpp - groupedit.cpp - sourceselect.cpp - kgpgchangekey.cpp - kgpgfirstassistant.cpp - kgpgexternalactions.cpp - selectexpirydate.cpp - caff.cpp - foldercompressjob.cpp - misc.cpp -) - -qt4_add_dbus_adaptor( kgpg_SRCS org.kde.kgpg.Key.xml keysmanager.h KeysManager) - -QT4_ADD_DBUS_INTERFACE(kgpg_SRCS org.kde.kgpg.Key.xml kgpg_interface ) - -kde4_add_ui_files(kgpg_SRCS + selectpublickeydialog.cpp + selectsecretkey.cpp + kgpgoptions.cpp + keysmanager.cpp + kgpg.cpp + main.cpp + kgpgkeygenerate.cpp + kgpginterface.cpp + kgpgtextinterface.cpp + gpgproc.cpp + klinebufferedprocess.cpp + keyservers.cpp + detailedconsole.cpp + keyinfodialog.cpp + newkey.cpp + keyexport.cpp + conf_encryption.cpp + kgpgrevokewidget.cpp + keytreeview.cpp + groupedit.cpp + sourceselect.cpp + kgpgchangekey.cpp + kgpgfirstassistant.cpp + kgpgexternalactions.cpp + selectexpirydate.cpp + caff.cpp + foldercompressjob.cpp + misc.cpp adduid.ui conf_gpg.ui searchres.ui @@ -147,11 +140,13 @@ kde4_add_ui_files(kgpg_SRCS sourceselect.ui ) -kde4_add_app_icon(kgpg_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app*-kgpg.png") +qt4_add_dbus_adaptor( kgpg_SRCS org.kde.kgpg.Key.xml keysmanager.h KeysManager) + +QT4_ADD_DBUS_INTERFACE(kgpg_SRCS org.kde.kgpg.Key.xml kgpg_interface ) kde4_add_kcfg_files(kgpg_SRCS kgpgsettings.kcfgc ) -kde4_add_executable(kgpg ${kgpg_SRCS}) +add_executable(kgpg ${kgpg_SRCS}) if (KGPG_DEBUG_TRANSACTIONS) get_target_property(KGPG_FLAGS kgpg COMPILE_DEFINITIONS) diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index 3760e182..691d330b 100644 --- a/kmix/CMakeLists.txt +++ b/kmix/CMakeLists.txt @@ -129,7 +129,7 @@ set(kmix_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} core/volume.cpp ) -kde4_add_executable( kmix ${kmix_SRCS}) +add_executable( kmix ${kmix_SRCS}) target_link_libraries(kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) @@ -212,7 +212,7 @@ set(kmixctrl_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS} # gui/guiprofile.cpp -kde4_add_executable( kmixctrl ${kmixctrl_SRCS}) +add_executable( kmixctrl ${kmixctrl_SRCS}) target_link_libraries(kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS}) diff --git a/kmix/tests/CMakeLists.txt b/kmix/tests/CMakeLists.txt index 1abd2b28..982d9e1d 100644 --- a/kmix/tests/CMakeLists.txt +++ b/kmix/tests/CMakeLists.txt @@ -12,7 +12,7 @@ qt4_add_dbus_adaptor( kmix_adaptor_SRCS set(profiletest_SRCS profiletest.cpp ) -kde4_add_executable(profiletest ${profiletest_SRCS} +add_executable(profiletest ${profiletest_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../gui/guiprofile.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../core/MasterControl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../core/mixer.cpp @@ -37,7 +37,7 @@ endif (PULSEAUDIO_FOUND) ########### next target ############### set(dialogtest_SRCS dialogtest.cpp ) -kde4_add_executable( dialogtest ${dialogtest_SRCS} ) +add_executable( dialogtest ${dialogtest_SRCS} ) target_link_libraries(dialogtest ${KDE4_KDEUI_LIBS} ) diff --git a/kolourpaint/CMakeLists.txt b/kolourpaint/CMakeLists.txt index e0bf15d9..17018921 100644 --- a/kolourpaint/CMakeLists.txt +++ b/kolourpaint/CMakeLists.txt @@ -7,66 +7,63 @@ find_package(QImageBlitz REQUIRED) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) include_directories( - -# GENERATED BY ./gen_cmake_include_dirs - -${CMAKE_CURRENT_SOURCE_DIR}/commands -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text -${CMAKE_CURRENT_SOURCE_DIR}/cursors -${CMAKE_CURRENT_SOURCE_DIR}/dialogs -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms -${CMAKE_CURRENT_SOURCE_DIR}/document -${CMAKE_CURRENT_SOURCE_DIR}/environments -${CMAKE_CURRENT_SOURCE_DIR}/environments/commands -${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs -${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib -${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms -${CMAKE_CURRENT_SOURCE_DIR}/environments/document -${CMAKE_CURRENT_SOURCE_DIR}/environments/tools -${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection -${CMAKE_CURRENT_SOURCE_DIR}/generic -${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets -${CMAKE_CURRENT_SOURCE_DIR}/imagelib -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms -${CMAKE_CURRENT_SOURCE_DIR}/layers -${CMAKE_CURRENT_SOURCE_DIR}/layers/selections -${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image -${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text -${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage -${CMAKE_CURRENT_SOURCE_DIR}/lgpl -${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic -${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic/widgets -${CMAKE_CURRENT_SOURCE_DIR}/mainWindow -${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx -${CMAKE_CURRENT_SOURCE_DIR}/tools -${CMAKE_CURRENT_SOURCE_DIR}/tools/flow -${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal -${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular -${CMAKE_CURRENT_SOURCE_DIR}/tools/selection -${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image -${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text -${CMAKE_CURRENT_SOURCE_DIR}/views -${CMAKE_CURRENT_SOURCE_DIR}/views/manager -${CMAKE_CURRENT_SOURCE_DIR}/widgets -${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity -${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib -${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects -${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars -${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options - -${KDE4_INCLUDES} -${QIMAGEBLITZ_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR}/commands + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text + ${CMAKE_CURRENT_SOURCE_DIR}/cursors + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms + ${CMAKE_CURRENT_SOURCE_DIR}/document + ${CMAKE_CURRENT_SOURCE_DIR}/environments + ${CMAKE_CURRENT_SOURCE_DIR}/environments/commands + ${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs + ${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib + ${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms + ${CMAKE_CURRENT_SOURCE_DIR}/environments/document + ${CMAKE_CURRENT_SOURCE_DIR}/environments/tools + ${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection + ${CMAKE_CURRENT_SOURCE_DIR}/generic + ${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms + ${CMAKE_CURRENT_SOURCE_DIR}/layers + ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections + ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image + ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text + ${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage + ${CMAKE_CURRENT_SOURCE_DIR}/lgpl + ${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic + ${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic/widgets + ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow + ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx + ${CMAKE_CURRENT_SOURCE_DIR}/tools + ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow + ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal + ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular + ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection + ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image + ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text + ${CMAKE_CURRENT_SOURCE_DIR}/views + ${CMAKE_CURRENT_SOURCE_DIR}/views/manager + ${CMAKE_CURRENT_SOURCE_DIR}/widgets + ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity + ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib + ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects + ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars + ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options + + ${KDE4_INCLUDES} + ${QIMAGEBLITZ_INCLUDES} ) add_subdirectory( pics ) @@ -106,89 +103,89 @@ create_license(${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${CMAKE_CURRENT_BINARY_DIR}/k if(CMAKE_MAJOR_VERSION MATCHES "2" AND CMAKE_MINOR_VERSION MATCHES "4" AND MINGW) set(kolourpaint_lib1_SRCS -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBalanceCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectClearCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectCommandBase.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectEmbossCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectFlattenCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectHSVCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectInvertCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/kpDocumentMetaInfoCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformFlipCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformRotateCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformSkewCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistoryBase.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistory.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandSize.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpMacroCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/kpNamedCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow/kpToolFlowCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolColorPickerCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolFloodFillCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal/kpToolPolygonalCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular/kpToolRectangularCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpAbstractSelectionContentCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionCreateCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionDestroyCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionMoveCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextDeleteCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextEnterCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextInsertCommand.cpp -${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorLightCross.cpp -${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorProvider.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects/kpEffectsDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpColorSimilarityDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp -${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument.cpp -${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Open.cpp -${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Save.cpp -${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocumentSaveOptions.cpp -${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Selection.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/commands/kpCommandEnvironment.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/document/kpDocumentEnvironment.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/kpEnvironmentBase.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/kpToolEnvironment.cpp -${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection/kpToolSelectionEnvironment.cpp -${CMAKE_CURRENT_SOURCE_DIR}/generic/kpSetOverrideCursorSaver.cpp -${CMAKE_CURRENT_SOURCE_DIR}/generic/kpWidgetMapper.cpp -${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpResizeSignallingLabel.cpp -${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpSubWindow.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBalance.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBlurSharpen.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectEmboss.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectFlatten.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectGrayscale.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectHSV.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectInvert.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectReduceColors.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectToneEnhance.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor_Constants.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpDocumentMetaInfo.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpFloodFill.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpPainter.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformAutoCrop.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_ImageSelection.cpp -${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_TextSelection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBalanceCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectClearCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectCommandBase.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectEmbossCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectFlattenCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectHSVCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectInvertCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/kpDocumentMetaInfoCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformFlipCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformRotateCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformSkewCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistoryBase.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandSize.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpMacroCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/kpNamedCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow/kpToolFlowCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolColorPickerCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolFloodFillCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal/kpToolPolygonalCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular/kpToolRectangularCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpAbstractSelectionContentCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionCreateCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionDestroyCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionMoveCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextDeleteCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextEnterCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextInsertCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorLightCross.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorProvider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects/kpEffectsDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpColorSimilarityDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Open.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Save.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocumentSaveOptions.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Selection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/commands/kpCommandEnvironment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/document/kpDocumentEnvironment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/kpEnvironmentBase.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/kpToolEnvironment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection/kpToolSelectionEnvironment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/generic/kpSetOverrideCursorSaver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/generic/kpWidgetMapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpResizeSignallingLabel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpSubWindow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBalance.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBlurSharpen.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectEmboss.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectFlatten.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectGrayscale.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectHSV.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectInvert.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectReduceColors.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectToneEnhance.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor_Constants.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpDocumentMetaInfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpFloodFill.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpPainter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformAutoCrop.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_ImageSelection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_TextSelection.cpp ) # kolourpaint_lib1_SRCS set(kolourpaint_lib2_SRCS @@ -319,8 +316,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetSpraycanSize.cp ) # set(kolourpaint_SRCS -kde4_add_library(kolourpaint_lib1 STATIC ${kolourpaint_lib1_SRCS}) -kde4_add_library(kolourpaint_lib2 STATIC ${kolourpaint_lib2_SRCS}) +add_library(kolourpaint_lib1 STATIC ${kolourpaint_lib1_SRCS}) +add_library(kolourpaint_lib2 STATIC ${kolourpaint_lib2_SRCS}) # doubled for the linker set(mingw_libs kolourpaint_lib1 kolourpaint_lib2 kolourpaint_lib1 kolourpaint_lib2) @@ -550,7 +547,7 @@ set(kolourpaint_lgpl_SRCS # This MUST be a dynamic link library to avoid LGPL license infection. # -kde4_add_library(kolourpaint_lgpl SHARED ${kolourpaint_lgpl_SRCS}) +add_library(kolourpaint_lgpl SHARED ${kolourpaint_lgpl_SRCS}) target_link_libraries(kolourpaint_lgpl ${KDE4_KIO_LIBS}) set_target_properties(kolourpaint_lgpl PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KOLOURPAINT4_LGPL_LIB ) @@ -562,9 +559,7 @@ install(TARGETS kolourpaint_lgpl ${INSTALL_TARGETS_DEFAULT_ARGS} ) # Executable # -kde4_add_app_icon(kolourpaint_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-kolourpaint.png") - -kde4_add_executable(kolourpaint ${kolourpaint_SRCS}) +add_executable(kolourpaint ${kolourpaint_SRCS}) target_link_libraries(kolourpaint ${KDE4_KIO_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${QIMAGEBLITZ_LIBRARIES} kolourpaint_lgpl) diff --git a/kolourpaint/ChangeLog b/kolourpaint/ChangeLog deleted file mode 100644 index 9acd0397..00000000 --- a/kolourpaint/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ - -For logs of _every_ single change made to KolourPaint between any date or -revision, visit: - - http://websvn.kde.org/trunk/KDE/kdegraphics/kolourpaint - - http://websvn.kde.org/branches/KDE//kdegraphics/kolourpaint - http://websvn.kde.org/tags/KDE//kdegraphics/kolourpaint - - http://websvn.kde.org/branches/kolourpaint - http://websvn.kde.org/tags/kolourpaint - - -For a summary of user-visible changes between each release, read NEWS. - diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt index f1ccb897..950d7839 100644 --- a/kompare/CMakeLists.txt +++ b/kompare/CMakeLists.txt @@ -29,9 +29,7 @@ kompare_shell.cpp kompareurldialog.cpp ) -kde4_add_app_icon(kompare_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-kompare.png") - -kde4_add_executable(kompare ${kompare_SRCS}) +add_executable(kompare ${kompare_SRCS}) target_link_libraries(kompare kompareinterface komparediff2 komparedialogpages ${KDE4_KTEXTEDITOR_LIBS} ) diff --git a/kompare/ChangeLog b/kompare/ChangeLog deleted file mode 100644 index ad8259db..00000000 --- a/kompare/ChangeLog +++ /dev/null @@ -1,423 +0,0 @@ -Dec 27, 2004 : Jeff Snyder - * Fix for bug 95640 (nothing displayed when kompare is embedded in Ark - fixed by forcing the delivery of childEvents to komparesplitter at - the end of its constructor - -Dec 20, 2004 : Jeff Snyder - * Things that have happened since 3.3: - (this list is not complete) - * Look & feel changed - -Dec 20, 2004 : Jeff Snyder - * Things that were changed sometime between Nov 25, 2003 and KDE 3.3: - (this list is not complete) - * KompareConnectWidget became draggable, by replacing KompareViewFrame - with KompareSplitter. - -Dec 20, 2004 : Jeff Snyder - * This changelog seems to have been neglected for over a year now. I'll - try to retroactively fix this as and when I remember things that have - been fixed - but it'll probably never be complete and accurate for the - Dec 2003 - Nov 2004 period. I'll be making entries concering what i'm - doing with kompare from now onwards. - -Nov 25, 2003 : Otto Bruggeman - * Fix nasty looping to the end of the file when hitting previous difference on the first difference in the first file - -Nov 25, 2003 : Laurent Montel - * Fix memleak, QStringList is implicitly shared so no need for a reference, it is already a pointer to data thing - -Nov 23, 2003 : Otto Bruggeman - * Fixed version string (bug 68872) - * Fix for 68871 (added slotNextDifference to slotApplyDifference()) - * Fix for a crash: dont call blendOriginalIntoModelList with Kompare::ShowingDiff - -Nov 22, 2003 : Otto Bruggeman - * Fix to make the bugs.kde.org dialog pop up instead of sending a mail to John when pressing - Help->Report bug... Also added my homepage since it has always been kompare's home imo. - -Nov 22, 2003 : Otto Bruggeman - * Rework the blendFile method so it actually works and as a bonus is a bit faster - This introduces a new form of show entire file when comparing, one that works - And because of it, it saves files properly now because the entire file is now available even if - you have a single line change in a million line file with only 2 context lines in the diff. - -Nov 22, 2003 : Otto Bruggeman - * Remove the Show entire file option. It only causes problems at the moment - Fixes bug 68729 - -Nov 22, 2003 : Otto Bruggeman - * Commenting out a lot of debug output, it has served it's purpose well in levenshteintable.cpp - -Nov 21, 2003 : Otto Bruggeman - * Also expand tabs to spaces in strings without or after Commands (in the INLINE_DIFFERENCES - code path and yes commands is a shitty name for them but i cant think of something decent) - -Nov 21, 2003 : Otto Bruggeman - * Real Fix (tm) for activating the Swap source with destination action - -Nov 21, 2003 : Otto Bruggeman - * Fix empty line drawing in the INLINE_DIFFERENCES code path - -Nov 20, 2003 : Otto Bruggeman - * When swapping source with destination also change the windows caption and the statusbar text - * Make sure that when swapping and when there are changes, all changes that were made can be - saved, discarded or cancel the whole swap (strings are recycled from the queryClose method) - * Give a better parent to the KIO::NetAccess::download in komparemodellist.cpp - * Added some FIXME's for after the branching to make the urls appear in bold in the error message - * Make queryClose not use the isModified from the part but from the modellist - -Nov 20, 2003 : Otto Bruggeman - * Fix for activating the Swap Source with Destination action. - -Nov 19, 2003 : Otto Bruggeman - * Fixed bug 68570, it needed temp vars otherwise it was overwriting source with destination and then - overwriting that destination with source which was just changed into destination - -Nov 17, 2003 : Otto Bruggeman - * Fix for empty -x and -X arguments. - * Fix bugs 58858 and 58531 by using Kompare::Custom instead of Kompare::Default - * Fix last selected url in the kurlcomboboxes - * Fix for inline differences when there is only 1 char left that still needs to be drawn - * Remove support for the -a Treat all files as text diff option. This caused all sorts of weird crashes - when parsing the diff output now with the custom options. - * Move the per preference page code in the diffprefs constructor into seperate methods per page - -Nov 14, 2003 : Otto Bruggeman - * Fix to make Kompare listen to the kdisplayFontChanged signal and set the font properly and redraw with the new font. - Found by David Faure. - -Nov 09, 2003 : Otto Bruggeman - * Implemented inline differences (deactivated until KDE3.2 has been branched) - * added support for the -x and -X options to diff (deactivated until KDE3.2 has been branched) - * Various other code cleanups/reindenting - -Nov 09, 2003 : Otto Bruggeman - * Code cleanups - -Nov 02, 2003 : Otto Bruggeman - * Fixed some more scrolling problems - lastItem->scrollId(), add lastItem->maxHeight() and substract the minScrollId() - That is the maxScrollId i need in the QScrollBar, took me long enough... - -Oct 05, 2003 : Otto Bruggeman - * Fixed the scrolling problems, a stupid regression i introduced, i cant simplify mathematic expressions apparently - * Added an implementation for double clicking a difference in the view, but it is not properly connected yet - void contentsMouseDoubleClickEvent ( QMouseEvent* ); - * Fixed embedding in Konqueror by implementing openURL() - * Removed m_maxScrollId, it is not necessary and only costs time, QScrollView::contentsHeight() does the same - * Fixed some more warnings about unused variables - * Fixed the initial drawing of the vertical and horizontal scrollbar - -Oct 04, 2003 : Otto Bruggeman - * Added a call to m_modelList->openDirAndDiff to openDirAndDiff - * Fixed some error strings by swapping the %# thingies - * Added some useless debug output - * Fixed KompareModelList::openDirAndDiff to use the right models variable (m_models instead of models) - -Oct 03, 2003 : Otto Bruggeman - * Fixed ApplyAll and UnApplyAll, stupid copy and paste error - * Fixed some warnings about signed and unsigned - * Fixed some warnings about unused variables - * Fixed some redrawing issues in the connection widget - -Sep 27, 2003 : Otto Bruggeman - * Fixed the redrawing problems in the connect widget with a QTimer::singleShot() - * Undid a stupid commit that changed the keyboard shortcuts for next and previous difference - * Fixed another bug in the navigation part that made it emit a signal twice - * Fixed a bug in the listview drawing, still one left that i cant seem to solve :( - -Sep 27, 2003 : Otto Bruggeman - * Moved the apply and navigation actions into the komparemodellist - * Fixed Ingo's problem with the next and prev difference KActions - -Sep 26, 2003 : Otto Bruggeman - * Added a struct Info in the Kompare namespace. This one contains all the info about what kompare is doing - * Fixed splitting the path string in diffmodel - * Fixed showing the path in komparenavtreepart in the directory listviews - -Sep 24, 2003 : Otto Bruggeman - * Fixes opening diffs, comparing files after moving all that code around - -Sep 23, 2003 : Otto Bruggeman - * Moved a lot of url downloading to the kompare part and moved the opening and reading of the downloads to komparemodellist - -Sep 22, 2003 : Otto Bruggeman - * Added openStdin() to KompareShell - * Fixed stupid implicit conversion from QString to QStringList in kompare_part.cpp - * Added openDiff( QStringList ) to the interface and to the part - -Sep 14, 2003 : Otto Bruggeman - * Fixed exit status of the kompare process - -Sep 13, 2003 : Otto Bruggeman - * Removed some files that apparently came back after the merge - -Sep 07, 2003 : Otto Bruggeman - * Some changes to the interface. Made the copy ctor and assignment operator - and added a private d-pointer - * Removed the use of all deprecated methods and replaced them with undeprecated ones :) - -Sep 02, 2003 : Scott Wheeler - * Made the interface pure virtual - -Sep 01, 2003 : Scott Wheeler - * Fixed constness of the KompareModelList constructor - * Fixed another 2 warnings about comapring signed with unsigned ints - * Fixed the initialization of the difault var - -Aug 27, 2003 : Otto Bruggeman - * After shitloads of trouble here finally some fixes for the stupid desktop - file stuff - * Fixes for when there are not enough args for a certain commandline option. - -Aug 22, 2003 : Otto Bruggeman - * Fixed converting tabs to spaces in the view, i totally screwed up - * View settings now get applied to the view after pressing ok. - (Maybe i should make them apply on APlly instead of OK) - -Aug 13, 2003 : Otto Bruggeman - * Komkommertijd :) InitialPreference=10 for kompare.desktop as - requested - -Aug 10, 2003 : Otto Bruggeman - * Backported Helge Deller's changes from head to make_it_cool - (kompare_shell.cpp 1.33 -> 1.34). This is about roaming user fixes. - Thanks Helge ! - -Jul 19, 2003 : Otto Bruggeman - * Backported Ingo Klocker's changes from head to make_it_cool - (kompare_shell.cpp 1.34 -> 1.35). This is about being able to - configure the shortcuts from kompare_part as well. Thanks Ingo ! - -Jun 29, 2003 : Otto Bruggeman - * Fixed bug 58144 by adding a check for comparing dirs, in that case - destinationURL is a directory and not a file name so we need to - recreate the filename. This involved changing some code to use a - different enum value, so i hope i did it the right way, session - management may be broken now when the session was stored with 3.1.2 - and restarted with 3.1.3. But that is unfortunately unfixable with a - kconf_update script. - -Jun 29, 2003 : Otto Bruggeman - * Removed a lot of commented code since it is no longer used and will - never be used again. - * Added 2 methods to the interface: openDiff3(KURL) and - openDiff3(QStringList) - * Fixed context diff parsing as indicated in bugreport 57774 - (the example works now, hope there are no regressions) - * Removed all references to MiscSettings and MiscPrefs. - These classes will disappear RSN. - * Fixed the history saving of the urls in the kompare dialog - * Parser is no longer a static class but one that needs to be - instanciated - * Added ViewSettings to KompareProcess, maybe it is better to merge the - diff and view settings into one class. - -May 3, 2003 : Otto Bruggeman - * Implemented support for -I in the regular diff options (the one in - the kompare options dialog) - * Fixed the braindamage i created in main.cpp so that kompare no - longer stalls because of a missing mainwindow - * Made the kcomparedialog more generic and renamed it to - kompareurldialog so i can reuse it for blending too - * Removed some braindamage in the kompare/Makefile.am - * Some compile fixes because of changes to the CXXFLAGS - (QRegExp::match cant be used anymore, and some other old style stuff) - * Added an action to the menu for blending - * moved Open file (or in this case Open Diff) to the top of the file - menu - * Fixed the accel conflict in the file menu between open diff and - compare files - -Apr 30, 2003 : Otto Bruggeman - * Implemented blending of a diff file with the original file - * Renamed General* View* (more appropriate) - * Renamed m_models into m_modelList since it is more appropriate in komparepart - * Small fixes to the view, but they break more than they fix :( - * Added commandline options for comparing, opening a diff file and - blending - -Apr 20, 2003 : Otto Bruggeman - * Fixed bug 54264 with a statusbar that gets too wide when long - filenames are used - * Fixed the missing endline problem in the parser (bug 56552) - * Fixed all copyright years (probably too many but hey i'll change - those files some time this year so it will be valid :P) - * Added support for using a different diff program (Bug 55573) - * Added support for using a different tabsize in the viewer (Bug 38776) - * The interface is now final i guess so this fixes bug 42849, not - every method is implemented but i'll get to them eventually. - -Apr 19, 2003 : Otto Bruggeman - * Fixed bug 56322 where openURL did not clear the models when called - again with a new diff - -Aug 9, 2002 : Otto Bruggeman - * Fixed the whatsthis text for the compare button in the compare dialog - * Fixed the history of the comboboxes in the compare dialog - * Put the komparemodellist and all needed classes in a Diff2 namespace - * Implemented a better parser design (see parser.cpp/h) - * Removed the need to directly link to the komparepart for the shellapp - * Removed the need to link directly to the komparepart for the navigationpart - * Added support for perforce diffs in the new Parser classes - * Added a push design for the modified status instead of a pull design - * Added an interface to the Komparepart so people can use that to - reuse the komparepart - -Jul 15, 2002 : Otto Bruggeman - * Fixed normal diff a bit more, filenames dont work yet - * Removed some code duplication - * Fixed diff output parsing with Common subdirectories in it - * Fixed Copyright years in the about box (thanks Carsten Niehaus) - * Removed the K3ShellProcess and replaced it with a K3Process - -Feb 18, 2002 : Otto Bruggeman - * Fixed scrolling with a wheel mouse in the kompare(list)view and - connectwidget and added a config option for the number of lines - that is scrolled per wheelscroll. - * Fixed the history somehow in the compare dialog. - * Implemented the separate directory/file widget. - * Implemented reading from stdin by using - as file on the commandline. - * Partly implemented a better way for ed and rcs parsing, i'll - improve this before KDE 3.0 is released - -Jan 10, 2002 : Otto Bruggeman - Comparing directories works now :) You can select them from the begin - dialog, and select a directory and then press ok. It will enter the - directory but dont select a file so it keeps the directory. - Known bug here is that directories need a trailing slash :( - -Oct 07, 2001 : Otto Bruggeman - Fix crash when part is not found, basically dont use kapp->quit() - but use exit(int). Would be interested to know why it crashes though, - the bt gave nothing meaningful here. I should have compiled kompare with - debug code. - -Sep 17/18, 2001 : Otto Bruggeman - Fixed some stuff dont know what anymore (writing this on oct 7) - Probably some more fixes for the klibloader. - -Sep 17, 2001 : Otto Bruggeman - Moved to kdesdk and renamed to kompare with preservation of history. - Changed almost every occurence of kdiff to kompare (not in this file). - -Sep 08, 2001 : Otto Bruggeman - Removed the qt3back dir, changed everything over to qt3, - qlist->qptrlist, qlistconstiterator->qptrlistconstiterator - -Jul 29, 2001 : John Firebaugh - Add some tests. - Add the qregexp3 backport. - Use qregexp3 for diff parsing -- soooo much cleaner. - All the diff options work. - -Jul 28, 2001 : John Firebaugh - Directories can be selected in the compare dialog - New base clase KDiff, holds some common stuff - Use an enum for format in preferences - Implement a save options dialog, displayed at "Save .diff" - The diff can be run in any directory, the paths to source - and destination will be automatically determined from this. - Save all. - -Jul 25, 2001 : John Firebaugh - Prompt to save changes on close - Show [modified] caption - Clean up internal save mechanism - -Jul 14, 2001 : John Firebaugh - New menu item "Swap source and destination". - Make empty selection work. - -Jul 13, 2001 : John Firebaugh - Text view now works in compare mode. - Fix clicking difference to select it. - Don't scroll to difference when clicking to select it. - Give the diff view a nice frame. - -Jul 12, 2001 : Otto Bruggeman - Stats work now, maybe they need more info but i dont know what yet. - Will think some more about it. - -Jul 12, 2001 : John Firebaugh - When comparing files, you can apply or unapply changes and save - the result. - New menu item "Show Text View" (loads the diff in embedded text viewer). - Better status notification. - Set the window caption when comparing. - -Jun 27, 2001 : John Firebaugh - Ported main view to QListView - Remove obsolete files - Clicking a difference in the main view selects it - Better scrolling - -Jun 24, 2001 : John Firebaugh - Coverted to dock window and added navigation tree in a dock. - Multiple file diffs are now supported. Each file will show up - as an item in the tree, with differences as children. - -Jun 22, 2001 : Otto Bruggeman - Tried implementing rcs and ed but they dont work atm, same for show - diffstats, will fix that asap. - -May 22, 2001 : John Firebaugh - Reworking of most of the view code. Looks pretty. - -May 18, 2001 : Otto Bruggeman - Context seems to work, implemented saving... might have some problems - left (saving that is) - -May 15, 2001 : John Firebaugh - Make the settings work for all windows. Probably some more changes :) - -May 14, 2001 : Otto Bruggeman - context diff does not work atm, there is some problem with the separa- - tion of old and new. Maybe the old and new needs to be reintegrated. - I fixed some functions and now diffmodel does no longer need static - functions. All loading is done from the kdiffpart and that is where - save should go as well. Removed determineDiffFormat because it is not - needed anymore. - -May 13, 2001 : Otto Bruggeman - contextdiff is better implemented it finds all stuff in the diff atm - but it does not work. - -May 04, 2001 : Otto Bruggeman - cleaned up the code by moving the part to a subdir - halfassed implementation of contextdiff, will update later today - -Apr 10, 2001 : John Firebaugh - use new model/view architecture (not completely implemented yet) - NOTE: it will (should) compile, but you won't see any differences... a - work in progress - -Apr 05, 2001 : Otto Bruggeman - Implemented the ability to move from chuck to chunk in the htmlview - Cleaned up the preferences, squashed a few bugs - -Apr 04, 2001 : Otto Bruggeman - Normal format works as well - -Apr 04, 2001 : Otto Bruggeman - Finally implemented the preferences menu... i still lack some nice - icons for it but that will be solved in the near future... - -Mar 25, 2001 : Otto Bruggeman - Moved the application icons to the pics dir - -Mar 20, 2001 : Otto Bruggeman - Fixed a stupid bug that caused the last line in the rightview not - to be colored. - Implemented slots for using the KHistoryCombo in the views to select - files with. - Still a nasty bug with regard to the initial directory in the - KFileDialog, needs to be fixed asap but i dont know the cause. - Still an error in the historylist and completionlist items. They are - not shown correctly. - -Mar 19, 2001 : Otto Bruggeman - Added most of the preferences dialog - Some speed improvements - Some fixes to use the last used directory in KFileDialog diff --git a/kompare/interfaces/CMakeLists.txt b/kompare/interfaces/CMakeLists.txt index 4bb0c6c5..bb157a6b 100644 --- a/kompare/interfaces/CMakeLists.txt +++ b/kompare/interfaces/CMakeLists.txt @@ -7,7 +7,7 @@ set(kompareinterface_LIB_SRCS kompareinterface.cpp ) -kde4_add_library(kompareinterface SHARED ${kompareinterface_LIB_SRCS}) +add_library(kompareinterface SHARED ${kompareinterface_LIB_SRCS}) target_link_libraries(kompareinterface ${KDE4_KDECORE_LIBS} ) diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt index 2efb33d4..d02a4925 100644 --- a/kompare/komparepart/CMakeLists.txt +++ b/kompare/komparepart/CMakeLists.txt @@ -12,10 +12,9 @@ set( komparepart_PART_SRCS kompareprefdlg.cpp komparesaveoptionsbase.cpp komparesaveoptionswidget.cpp - kompareview.cpp ) - - -kde4_add_ui_files(komparepart_PART_SRCS komparesaveoptionsbase.ui ) + kompareview.cpp + komparesaveoptionsbase.ui +) kde4_add_plugin(komparepart ${komparepart_PART_SRCS}) diff --git a/kompare/libdialogpages/CMakeLists.txt b/kompare/libdialogpages/CMakeLists.txt index d6e139d3..551526ca 100644 --- a/kompare/libdialogpages/CMakeLists.txt +++ b/kompare/libdialogpages/CMakeLists.txt @@ -10,7 +10,7 @@ set(dialogpages_PART_SRCS viewpage.cpp ) -kde4_add_library(komparedialogpages SHARED ${dialogpages_PART_SRCS}) +add_library(komparedialogpages SHARED ${dialogpages_PART_SRCS}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../libkomparediff2 ) diff --git a/kompare/libkomparediff2/CMakeLists.txt b/kompare/libkomparediff2/CMakeLists.txt index 9ae73b49..4fb74d38 100644 --- a/kompare/libkomparediff2/CMakeLists.txt +++ b/kompare/libkomparediff2/CMakeLists.txt @@ -8,23 +8,24 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories (${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) set(komparediff2_SRCS - kompareprocess.cpp - komparemodellist.cpp - diffmodellist.cpp - diffmodel.cpp - difference.cpp - diffhunk.cpp - diffsettings.cpp - settingsbase.cpp - parser.cpp - parserbase.cpp - cvsdiffparser.cpp - diffparser.cpp - perforceparser.cpp - stringlistpair.cpp) + kompareprocess.cpp + komparemodellist.cpp + diffmodellist.cpp + diffmodel.cpp + difference.cpp + diffhunk.cpp + diffsettings.cpp + settingsbase.cpp + parser.cpp + parserbase.cpp + cvsdiffparser.cpp + diffparser.cpp + perforceparser.cpp + stringlistpair.cpp +) -kde4_add_library(komparediff2 SHARED ${komparediff2_SRCS}) +add_library(komparediff2 SHARED ${komparediff2_SRCS}) target_link_libraries(komparediff2 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) @@ -33,7 +34,9 @@ SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS komparediff2 EXPORT LibKompareDiff2Targets ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() install(FILES diff2export.h diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt index 646b0525..a5c697e7 100644 --- a/krdc/CMakeLists.txt +++ b/krdc/CMakeLists.txt @@ -80,6 +80,7 @@ set(krdc_SRCS tabbedviewwidget.cpp mainwindow.cpp main.cpp + config/general.ui ) if(TelepathyQt4_FOUND) @@ -88,13 +89,7 @@ if(TelepathyQt4_FOUND) ) endif() -kde4_add_ui_files(krdc_SRCS - config/general.ui -) - -kde4_add_app_icon(krdc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/krdc.png") - -kde4_add_executable(krdc ${krdc_SRCS}) +add_executable(krdc ${krdc_SRCS}) target_link_libraries(krdc ${KDE4_KFILE_LIBS} diff --git a/krdc/core/CMakeLists.txt b/krdc/core/CMakeLists.txt index 99ee7693..f5464fbc 100644 --- a/krdc/core/CMakeLists.txt +++ b/krdc/core/CMakeLists.txt @@ -9,7 +9,7 @@ set(krdccore_SRCS kde4_add_kcfg_files(krdccore_SRCS settings.kcfgc) -kde4_add_library(krdccore SHARED ${krdccore_SRCS}) +add_library(krdccore SHARED ${krdccore_SRCS}) target_link_libraries(krdccore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/krdc/krdc_approver/CMakeLists.txt b/krdc/krdc_approver/CMakeLists.txt index 3c397275..5ac2b97e 100644 --- a/krdc/krdc_approver/CMakeLists.txt +++ b/krdc/krdc_approver/CMakeLists.txt @@ -6,7 +6,7 @@ set (krdc_rfb_approver_SRCS approver.cpp ) -kde4_add_executable(krdc_rfb_approver ${krdc_rfb_approver_SRCS}) +add_executable(krdc_rfb_approver ${krdc_rfb_approver_SRCS}) target_link_libraries(krdc_rfb_approver ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES} ) diff --git a/krdc/rdp/CMakeLists.txt b/krdc/rdp/CMakeLists.txt index 19138ec0..0095740d 100644 --- a/krdc/rdp/CMakeLists.txt +++ b/krdc/rdp/CMakeLists.txt @@ -14,9 +14,6 @@ if(HAVE_XFREERDP) rdphostpreferences.cpp rdpviewfactory.cpp rdpview.cpp - ) - - kde4_add_ui_files(rdpplugin_SRCS rdppreferences.ui ) diff --git a/krdc/vnc/CMakeLists.txt b/krdc/vnc/CMakeLists.txt index bfbd26fa..ce0d4830 100644 --- a/krdc/vnc/CMakeLists.txt +++ b/krdc/vnc/CMakeLists.txt @@ -12,9 +12,6 @@ if(LIBVNCSERVER_FOUND) vncclientthread.cpp vncviewfactory.cpp vncview.cpp - ) - - kde4_add_ui_files(vncplugin_SRCS vncpreferences.ui ) diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt index 100b49b6..e7d4ab40 100644 --- a/krfb/krfb/CMakeLists.txt +++ b/krfb/krfb/CMakeLists.txt @@ -11,7 +11,7 @@ set (krfbprivate_SRCS framebufferplugin.cpp ) -kde4_add_library (krfbprivate +add_library (krfbprivate SHARED ${krfbprivate_SRCS} ) @@ -52,19 +52,23 @@ if(KTP_FOUND) include_directories(${KTP_INCLUDE_DIR}) endif() -set (krfb_SRCS - connectiondialog.cpp - events.cpp - framebuffermanager.cpp - main.cpp - mainwindow.cpp - sockethelpers.cpp - trayicon.cpp - rfbservermanager.cpp - rfbserver.cpp - rfbclient.cpp - invitationsrfbserver.cpp - invitationsrfbclient.cpp +set(krfb_SRCS + connectiondialog.cpp + events.cpp + framebuffermanager.cpp + main.cpp + mainwindow.cpp + sockethelpers.cpp + trayicon.cpp + rfbservermanager.cpp + rfbserver.cpp + rfbclient.cpp + invitationsrfbserver.cpp + invitationsrfbclient.cpp + configtcp.ui + configsecurity.ui + connectionwidget.ui + mainwidget.ui ) if(TelepathyQt4_FOUND) @@ -72,27 +76,13 @@ if(TelepathyQt4_FOUND) ${krfb_SRCS} tubesrfbserver.cpp tubesrfbclient.cpp + tubesconnectionwidget.ui ) endif() -kde4_add_kcfg_files (krfb_SRCS - krfbconfig.kcfgc -) - -kde4_add_ui_files (krfb_SRCS - ui/configtcp.ui - ui/configsecurity.ui - ui/connectionwidget.ui - ui/mainwidget.ui -) +kde4_add_kcfg_files (krfb_SRCS krfbconfig.kcfgc) -if(TelepathyQt4_FOUND) - kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui) -endif() - -kde4_add_executable (krfb - ${krfb_SRCS} -) +add_executable (krfb ${krfb_SRCS}) target_link_libraries (krfb krfbprivate diff --git a/krfb/krfb/ui/configsecurity.ui b/krfb/krfb/configsecurity.ui similarity index 100% rename from krfb/krfb/ui/configsecurity.ui rename to krfb/krfb/configsecurity.ui diff --git a/krfb/krfb/ui/configtcp.ui b/krfb/krfb/configtcp.ui similarity index 100% rename from krfb/krfb/ui/configtcp.ui rename to krfb/krfb/configtcp.ui diff --git a/krfb/krfb/ui/connectionwidget.ui b/krfb/krfb/connectionwidget.ui similarity index 100% rename from krfb/krfb/ui/connectionwidget.ui rename to krfb/krfb/connectionwidget.ui diff --git a/krfb/krfb/ui/invitewidget.ui b/krfb/krfb/invitewidget.ui similarity index 100% rename from krfb/krfb/ui/invitewidget.ui rename to krfb/krfb/invitewidget.ui diff --git a/krfb/krfb/ui/mainwidget.ui b/krfb/krfb/mainwidget.ui similarity index 100% rename from krfb/krfb/ui/mainwidget.ui rename to krfb/krfb/mainwidget.ui diff --git a/krfb/krfb/ui/tubesconnectionwidget.ui b/krfb/krfb/tubesconnectionwidget.ui similarity index 100% rename from krfb/krfb/ui/tubesconnectionwidget.ui rename to krfb/krfb/tubesconnectionwidget.ui diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt index 82b22d3f..60c10928 100644 --- a/ksnapshot/CMakeLists.txt +++ b/ksnapshot/CMakeLists.txt @@ -35,7 +35,8 @@ set(ksnapshot_file_SRCS set(ksnapshot_SRCS main.cpp - ksnapshot.cpp + ksnapshot.cpp + ksnapshotwidget.ui ${ksnapshot_file_SRCS}) if (KIPI_FOUND) @@ -49,12 +50,7 @@ endif (KIPI_FOUND) qt4_add_dbus_adaptor(ksnapshot_SRCS org.kde.ksnapshot.xml ksnapshot.h KSnapshot) - -kde4_add_ui_files(ksnapshot_SRCS ksnapshotwidget.ui) - -kde4_add_app_icon(ksnapshot_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-ksnapshot.png") - -kde4_add_executable(ksnapshot ${ksnapshot_SRCS}) +add_executable(ksnapshot ${ksnapshot_SRCS}) target_link_libraries(ksnapshot ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) @@ -73,10 +69,10 @@ install(TARGETS ksnapshot ${INSTALL_TARGETS_DEFAULT_ARGS}) set(kbackgroundsnapshot_SRCS kbackgroundsnapshot.cpp - ${ksnapshot_file_SRCS}) - + ${ksnapshot_file_SRCS} +) -kde4_add_executable(kbackgroundsnapshot ${kbackgroundsnapshot_SRCS}) +add_executable(kbackgroundsnapshot ${kbackgroundsnapshot_SRCS}) target_link_libraries(kbackgroundsnapshot ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) diff --git a/ksystemlog/CMakeLists.txt b/ksystemlog/CMakeLists.txt index 017ade9e..62669814 100644 --- a/ksystemlog/CMakeLists.txt +++ b/ksystemlog/CMakeLists.txt @@ -14,10 +14,6 @@ include(CheckPrototypeExists) include(CheckTypeSize) set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) -if(WIN32) - set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES}) - set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES}) -endif(WIN32) add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) @@ -60,4 +56,6 @@ add_subdirectory(src/modes/postfix) add_subdirectory(src/modes/samba) add_subdirectory(src/modes/cups) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/ksystemlog/Changelog b/ksystemlog/Changelog deleted file mode 100644 index 1cfb89d4..00000000 --- a/ksystemlog/Changelog +++ /dev/null @@ -1,217 +0,0 @@ - -Current Development Version (0.4.1) -=================================== - - - Compatibility with KDE 4 beta4 - - Fix icon position in search bar - - Add test coverage for Kernel logs - - Support for Suse Kernel logs - - Add joker to file list in configuration - - Auto-recognizition of the opened files - -Previous Releases -=========================== - -KSystemLog 0.4 Release ----------------------- - -This major rewrite of KSystemLog took between 3 and 4 months of development. - - - **Major rewrite** of KSystemLog. All core parts have been totally rewritten. - - Compatible with KDE 4. - - Use of Oxygen icons. - - New search bar (like the Firefox search bar). - - Integrated Progress dialog into the main window. - - History on log messages. - - No more crash each 5 minutes. - - Highly decrease the number of memory leaks. - - Modularization of log modes (kernel, system, authentication,...). - - New XSession log mode. - - Vastly improved version of Apache, Samba, Cups and ACPID log modes. - - No more layout problem in Details dialog. - - No more layout problem in Configuration Dialog. - - Kernel log mode is now using the "dmesg" command output - - Remove Boot log (no interested log file in distributions) - - Remove the "Group By" [Date/User/...] feature in contextual menu during refactoring. This feature could be reimplemented in future release. - -KSystemLog 0.3.3 Release ------------------------- - -Major Features and Improvements -............................... - - - Writing documentation (still miss a lot of things). - - Support for a system tray notifier (thanks to Jean-Rémy Falleri). - - Adding Printing (many thanks to Bojan). - - Adding SSH mode (many thanks to Bojan). - -Minor Fixes -........... - - - Do not use kdesu by default, a distrib/desktop dependent solution (thanks to Jonathan Riddell). - - Displaying KSystemLog in Gnome (thanks to Jonathan Riddell). - - Fix problems detected by http://www.icefox.net/kde/tests website. (pre-incrementation, TRUE->true, KConfigXT XML Doctype...) - - Updating French translation. - - Fix documentation and translations compilations. - - Optimization - - Minor fixes... - -KSystemLog 0.3.2 Release ------------------------- - -Major Features and Improvements -............................... - - - Improve a little bit the starting of KSystemLog. - - Add the Apache log. - - Add the Postfix log. - - Add the Samba log. - - Dialog box for sending log message manually from a dialog box. - - Log Toolbar is now visible by default, but only main logs are displayed. - - Colorize log lines by default. - -Minor Fixes -........... - - - Add a grayed "Type your filter here" in the filter (like Amarok). - - Remove shortcut on each log mode. They were to annoying to manage. The user always can bind the key he wants for a log. - - A double-click on an item opens the Detail Dialog. - - Fix a bug which decreased the log file reading. - - Add the Group By action to the Toolbar. - - Using sub-folders to sort source files - - Remove a useless space in most of logs - - Improve the saving of log views layout (column order is now saved) - - Remove tons of memory leaks - - Definetly fix the Detail Dialog by drawing it with Qt Designer - -KSystemLog 0.3.1 Release ------------------------- - -Major Features and Improvements -............................... - - - Fix the compilation problem on KDE 3.3. KSystemLog should now even compile on KDE 3.2 - - Add an option to remove the process identifier from the process column - - Add an option to colorize log lines depending on their log level - - Correctly save the window size on exit - -Minor Fixes -........... - - - New icon ! (made by a non-artist developer ;-) - - KUbuntu, Mandriva, Debian and Gentoo packages for 0.3 - -KSystemLog 0.3 Release ----------------------- - -Major Features and Improvements -............................... - - - Group By <Column> menu item to sort items in a tree (with root nodes of the selected column). - - Progress bar Dialog when loading (and reloading) logs - - New option finding same entries and remove them - - Management of a character limit per line (from configuration dialog) - - Save the sorting and sort column state and reload it at startup - - Add a menu item to hide the filter - - Cool Group By main entries' look - - Middle button on a log icon opens it in a new tab (And Ctrl+Left click and Shift+Left Click) - -Minor Fixes -........... - - - Fixing KDE 3.2 Compilation problem - - Updated translations for : Breton, Danish, German, Greek, English, Estonian, French, Irish, Italian, Panjabi, Polish, Kinyarwanda, Swedish and Turkish - - Same size for Next and Previous button in detail dialog - - Reload (an resize) correctly the content of the detail dialog - - Add more log levels managed in Cups log - - Fix a bug which strips message of the Acpid log - - Save the group by sorting in the config file - - Manage log lines with more than 1024 characters - - Fix many typography errors (thanks to Andrew Coles) - - Splitting of KSystemLog and LogManager classes, to allow displaying other kind of view in the center of KSystemLog - - Remove source code automatically managed by KDE Libs (and respective slot/signal pairs) - - Saving size of the windows, and Toolbar/menu configuration between KSystemLog launching - - Mandriva Package (KSystemLog 0.2.2) - - KUbuntu Package (KSystemLog 0.2.2) - - Hide the log toolbar by default - - Fix the limit ignoring problem - - Fix the unknown and mysterious crash bug - - A lot of bug fixes (reloading and detail dialog, NULL pointers...) - -KSystemLog 0.2.1 and 0.2.2 Release ----------------------------------- - - - French translation updated - - KDE 3.3 compilation error fixed - - English typography errors fixed - -KSystemLog 0.2 Release ----------------------- - -The new version of KSystemLog is now available ! 0.2 version adds several major features to KSystemLog. -The translations are not updated, but the strings are freezed for 4-5 days, so do not hesitate to help -me translating KSystemLog ! - -Major Features and Improvements -............................... - - - KSystemLog can open multiple log files thanks to its tabbed interface - - Using KConfigXT (yeah!) - - Implements the Find / Find next features - - A Send to a friend button - - Add support for ACPId Log file - - Add support for Cups log files - - Smaller popup in the main view - - Tooltip and What this in configuration dialog - - Saving the opened tabs list on exit - - KSystemLog Web site ! - -Minor Fixes -........... - - - KSystemlog.desktop fixed (thanks to EliasP) - - Debian Packages for Sarge, SID, and SID with KDE 3.4 - - SuSe 9.3 package (checkinstall package) - - Conectiva 10 package - - Gentoo ebuild - - Number of line added in other logs - - Many bugs fixed - - Replace old email address to new one - - Number of lines added in other logs - -KSystemLog 0.1.1 Release (05/06/2005) -------------------------------------- - -This version is a bugfixed version of KSystemLog 0.1. - - - Correctly parse internal messages of Syslog Deamon - - Fix columns problem when we switch between Kernel and System logs - - Fix parsing problem of Kernel/Boot/Authentication logs (damned Copy/Paste) - - Reimplement the Dialog Box, to have the Next and Previous features, non modal behavior... - - Improve (a little) the parsing speed of SysLog and Xorg logs. - - Add a little vertical line between each column (what an eye candy feature ;-) - - Fix KSystemLog compilation problems with KDE 3.3 (and maybe older version) - - French translation of KSystemLog - -Initial Release of KSystemLog 0.1 (05/05/2005) ----------------------------------------------- - -I am proud to announce the first public release of KSystemLog. I worked on the version since 2 months, and I hope you will like it. - -**Here is a list of features :** - - - Open multiple log files and append them to the list - - Auto display new log lines (with a bold font to better see them) - - Quick sort of each column - - Easily con figuration of each source file (to don't have any problem with different management of syslog in each distribution) - - Stop and resume the log analysis - - Copy to clipboard feature and Save to file, to help newbie sending report to developer - - X.org and all Syslog file format supported. (and many more in the next version...) - - Display advanced informations about each lines (level, date, message, user, process, host name, etc.), with a specific popup or a dialog box. - - - - -*This file use the reStructuredText format.* - -*More information at http://en.wikipedia.org/wiki/ReStructuredText* \ No newline at end of file diff --git a/ksystemlog/src/CMakeLists.txt b/ksystemlog/src/CMakeLists.txt index cc1e2e15..c3ba80c7 100644 --- a/ksystemlog/src/CMakeLists.txt +++ b/ksystemlog/src/CMakeLists.txt @@ -2,68 +2,64 @@ ########### Build ############### include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/config - ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${CMAKE_CURRENT_BINARY_DIR}/config - ${CMAKE_CURRENT_BINARY_DIR}/lib - ${CMAKE_CURRENT_SOURCE_DIR} - - ${CMAKE_CURRENT_SOURCE_DIR}/modes/open + ${CMAKE_CURRENT_SOURCE_DIR}/config + ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_CURRENT_BINARY_DIR}/config + ${CMAKE_CURRENT_BINARY_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/modes/system - ${CMAKE_CURRENT_SOURCE_DIR}/modes/kernel - ${CMAKE_CURRENT_SOURCE_DIR}/modes/daemon - ${CMAKE_CURRENT_SOURCE_DIR}/modes/xorg - ${CMAKE_CURRENT_SOURCE_DIR}/modes/cron - ${CMAKE_CURRENT_SOURCE_DIR}/modes/acpid - ${CMAKE_CURRENT_SOURCE_DIR}/modes/xsession - ${CMAKE_CURRENT_SOURCE_DIR}/modes/apache - ${CMAKE_CURRENT_SOURCE_DIR}/modes/cups - ${CMAKE_CURRENT_SOURCE_DIR}/modes/samba - ${CMAKE_CURRENT_SOURCE_DIR}/modes/authentication - ${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix -) - -set(ksystemlog_sources - main.cpp - mainWindow.cpp - logModePluginsLoader.cpp - loggerDialog.cpp - detailDialog.cpp - generalConfigurationWidget.cpp - configurationDialog.cpp - tabLogViewsWidget.cpp - tabLogManager.cpp - statusBar.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/modes/open + ${CMAKE_CURRENT_SOURCE_DIR}/modes/system + ${CMAKE_CURRENT_SOURCE_DIR}/modes/kernel + ${CMAKE_CURRENT_SOURCE_DIR}/modes/daemon + ${CMAKE_CURRENT_SOURCE_DIR}/modes/xorg + ${CMAKE_CURRENT_SOURCE_DIR}/modes/cron + ${CMAKE_CURRENT_SOURCE_DIR}/modes/acpid + ${CMAKE_CURRENT_SOURCE_DIR}/modes/xsession + ${CMAKE_CURRENT_SOURCE_DIR}/modes/apache + ${CMAKE_CURRENT_SOURCE_DIR}/modes/cups + ${CMAKE_CURRENT_SOURCE_DIR}/modes/samba + ${CMAKE_CURRENT_SOURCE_DIR}/modes/authentication + ${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix ) -kde4_add_ui_files(ksystemlog_sources - detailDialogBase.ui - loggerDialogBase.ui - generalConfigurationWidgetBase.ui +set(ksystemlog_sources + main.cpp + mainWindow.cpp + logModePluginsLoader.cpp + loggerDialog.cpp + detailDialog.cpp + generalConfigurationWidget.cpp + configurationDialog.cpp + tabLogViewsWidget.cpp + tabLogManager.cpp + statusBar.cpp + detailDialogBase.ui + loggerDialogBase.ui + generalConfigurationWidgetBase.ui ) -kde4_add_executable(ksystemlog ${ksystemlog_sources}) +add_executable(ksystemlog ${ksystemlog_sources}) target_link_libraries(ksystemlog - ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_config - ksystemlog_open - ksystemlog_system - ksystemlog_kernel - ksystemlog_xorg - ksystemlog_cron - ksystemlog_apache - ksystemlog_authentication - ksystemlog_daemon - ksystemlog_acpid - ksystemlog_xsession - ksystemlog_postfix - ksystemlog_cups - ksystemlog_samba + ${KDE4_KIO_LIBS} + ${KDE4_KDEUI_LIBS} + ksystemlog_lib + ksystemlog_config + ksystemlog_open + ksystemlog_system + ksystemlog_kernel + ksystemlog_xorg + ksystemlog_cron + ksystemlog_apache + ksystemlog_authentication + ksystemlog_daemon + ksystemlog_acpid + ksystemlog_xsession + ksystemlog_postfix + ksystemlog_cups + ksystemlog_samba ) ########### Installation ############### diff --git a/ksystemlog/src/config/CMakeLists.txt b/ksystemlog/src/config/CMakeLists.txt index a1578960..550c54d0 100644 --- a/ksystemlog/src/config/CMakeLists.txt +++ b/ksystemlog/src/config/CMakeLists.txt @@ -9,7 +9,7 @@ set(ksystemlog_config_SRCS kde4_add_kcfg_files(ksystemlog_config_SRCS ksystemlogConfig.kcfgc) -kde4_add_library(ksystemlog_config STATIC ${ksystemlog_config_SRCS}) +add_library(ksystemlog_config STATIC ${ksystemlog_config_SRCS}) target_link_libraries(ksystemlog_config ${KDE4_KDEUI_LIBS} diff --git a/ksystemlog/src/lib/CMakeLists.txt b/ksystemlog/src/lib/CMakeLists.txt index 561e69cf..5bcdd590 100644 --- a/ksystemlog/src/lib/CMakeLists.txt +++ b/ksystemlog/src/lib/CMakeLists.txt @@ -36,12 +36,10 @@ set(ksystemlog_lib_sources multipleActions.cpp levelPrintPage.cpp - + logViewSearchWidgetBase.ui ) -kde4_add_ui_files(ksystemlog_lib_sources logViewSearchWidgetBase.ui) - -kde4_add_library(ksystemlog_lib STATIC ${ksystemlog_lib_sources}) +add_library(ksystemlog_lib STATIC ${ksystemlog_lib_sources}) add_dependencies( ksystemlog_lib diff --git a/ksystemlog/src/modes/acpid/CMakeLists.txt b/ksystemlog/src/modes/acpid/CMakeLists.txt index ec86124c..46131069 100644 --- a/ksystemlog/src/modes/acpid/CMakeLists.txt +++ b/ksystemlog/src/modes/acpid/CMakeLists.txt @@ -17,7 +17,7 @@ set(ksystemlog_acpid_sources acpidFactory.cpp ) -kde4_add_library(ksystemlog_acpid STATIC ${ksystemlog_acpid_sources}) +add_library(ksystemlog_acpid STATIC ${ksystemlog_acpid_sources}) add_dependencies( ksystemlog_acpid diff --git a/ksystemlog/src/modes/apache/CMakeLists.txt b/ksystemlog/src/modes/apache/CMakeLists.txt index 5b1964f9..a9906215 100644 --- a/ksystemlog/src/modes/apache/CMakeLists.txt +++ b/ksystemlog/src/modes/apache/CMakeLists.txt @@ -20,7 +20,7 @@ set(ksystemlog_apache_sources apacheAccessLogMode.cpp ) -kde4_add_library(ksystemlog_apache STATIC ${ksystemlog_apache_sources}) +add_library(ksystemlog_apache STATIC ${ksystemlog_apache_sources}) add_dependencies( ksystemlog_apache diff --git a/ksystemlog/src/modes/authentication/CMakeLists.txt b/ksystemlog/src/modes/authentication/CMakeLists.txt index 12a8ad6e..b908db56 100644 --- a/ksystemlog/src/modes/authentication/CMakeLists.txt +++ b/ksystemlog/src/modes/authentication/CMakeLists.txt @@ -16,7 +16,7 @@ set(ksystemlog_authentication_sources authenticationFactory.cpp ) -kde4_add_library(ksystemlog_authentication STATIC ${ksystemlog_authentication_sources}) +add_library(ksystemlog_authentication STATIC ${ksystemlog_authentication_sources}) add_dependencies( ksystemlog_authentication diff --git a/ksystemlog/src/modes/base/CMakeLists.txt b/ksystemlog/src/modes/base/CMakeLists.txt index eb10d93a..3d276ed7 100644 --- a/ksystemlog/src/modes/base/CMakeLists.txt +++ b/ksystemlog/src/modes/base/CMakeLists.txt @@ -14,14 +14,12 @@ set(ksystemlog_base_mode_sources logLevelSelectionDialog.cpp genericConfiguration.cpp syslogAnalyzer.cpp + fileListBase.ui + multipleFileListBase.ui + logLevelSelectionDialogBase.ui ) -kde4_add_ui_files(ksystemlog_base_mode_sources fileListBase.ui ) -kde4_add_ui_files(ksystemlog_base_mode_sources multipleFileListBase.ui ) - -kde4_add_ui_files(ksystemlog_base_mode_sources logLevelSelectionDialogBase.ui ) - -kde4_add_library(ksystemlog_base_mode STATIC ${ksystemlog_base_mode_sources}) +add_library(ksystemlog_base_mode STATIC ${ksystemlog_base_mode_sources}) add_dependencies( ksystemlog_base_mode diff --git a/ksystemlog/src/modes/cron/CMakeLists.txt b/ksystemlog/src/modes/cron/CMakeLists.txt index 9da2d904..1ba77375 100644 --- a/ksystemlog/src/modes/cron/CMakeLists.txt +++ b/ksystemlog/src/modes/cron/CMakeLists.txt @@ -17,7 +17,7 @@ set(ksystemlog_cron_sources cronFactory.cpp ) -kde4_add_library(ksystemlog_cron STATIC ${ksystemlog_cron_sources}) +add_library(ksystemlog_cron STATIC ${ksystemlog_cron_sources}) add_dependencies( ksystemlog_cron diff --git a/ksystemlog/src/modes/cups/CMakeLists.txt b/ksystemlog/src/modes/cups/CMakeLists.txt index fb95f3c1..c750cb24 100644 --- a/ksystemlog/src/modes/cups/CMakeLists.txt +++ b/ksystemlog/src/modes/cups/CMakeLists.txt @@ -32,7 +32,7 @@ set(ksystemlog_cups_sources ) -kde4_add_library(ksystemlog_cups STATIC ${ksystemlog_cups_sources}) +add_library(ksystemlog_cups STATIC ${ksystemlog_cups_sources}) add_dependencies( ksystemlog_cups diff --git a/ksystemlog/src/modes/daemon/CMakeLists.txt b/ksystemlog/src/modes/daemon/CMakeLists.txt index b037ae3f..60f3a532 100644 --- a/ksystemlog/src/modes/daemon/CMakeLists.txt +++ b/ksystemlog/src/modes/daemon/CMakeLists.txt @@ -15,7 +15,7 @@ set(ksystemlog_daemon_sources daemonFactory.cpp ) -kde4_add_library(ksystemlog_daemon STATIC ${ksystemlog_daemon_sources}) +add_library(ksystemlog_daemon STATIC ${ksystemlog_daemon_sources}) add_dependencies( ksystemlog_daemon diff --git a/ksystemlog/src/modes/kernel/CMakeLists.txt b/ksystemlog/src/modes/kernel/CMakeLists.txt index 10050553..d69332af 100644 --- a/ksystemlog/src/modes/kernel/CMakeLists.txt +++ b/ksystemlog/src/modes/kernel/CMakeLists.txt @@ -13,7 +13,7 @@ set(ksystemlog_kernel_sources kernelItemBuilder.cpp ) -kde4_add_library(ksystemlog_kernel STATIC ${ksystemlog_kernel_sources}) +add_library(ksystemlog_kernel STATIC ${ksystemlog_kernel_sources}) add_dependencies( ksystemlog_kernel diff --git a/ksystemlog/src/modes/open/CMakeLists.txt b/ksystemlog/src/modes/open/CMakeLists.txt index f6aad5ed..0a64438d 100644 --- a/ksystemlog/src/modes/open/CMakeLists.txt +++ b/ksystemlog/src/modes/open/CMakeLists.txt @@ -13,7 +13,7 @@ set(ksystemlog_open_sources ) -kde4_add_library(ksystemlog_open STATIC ${ksystemlog_open_sources}) +add_library(ksystemlog_open STATIC ${ksystemlog_open_sources}) add_dependencies( ksystemlog_open diff --git a/ksystemlog/src/modes/postfix/CMakeLists.txt b/ksystemlog/src/modes/postfix/CMakeLists.txt index 404decb1..d2d861f7 100644 --- a/ksystemlog/src/modes/postfix/CMakeLists.txt +++ b/ksystemlog/src/modes/postfix/CMakeLists.txt @@ -15,7 +15,7 @@ set(ksystemlog_postfix_sources postfixLogMode.cpp ) -kde4_add_library(ksystemlog_postfix STATIC ${ksystemlog_postfix_sources}) +add_library(ksystemlog_postfix STATIC ${ksystemlog_postfix_sources}) add_dependencies( ksystemlog_postfix diff --git a/ksystemlog/src/modes/samba/CMakeLists.txt b/ksystemlog/src/modes/samba/CMakeLists.txt index 6d777aa7..e7b6045c 100644 --- a/ksystemlog/src/modes/samba/CMakeLists.txt +++ b/ksystemlog/src/modes/samba/CMakeLists.txt @@ -20,7 +20,7 @@ set(ksystemlog_samba_sources ) -kde4_add_library(ksystemlog_samba STATIC ${ksystemlog_samba_sources}) +add_library(ksystemlog_samba STATIC ${ksystemlog_samba_sources}) add_dependencies( ksystemlog_samba diff --git a/ksystemlog/src/modes/system/CMakeLists.txt b/ksystemlog/src/modes/system/CMakeLists.txt index 00c11d56..9db11393 100644 --- a/ksystemlog/src/modes/system/CMakeLists.txt +++ b/ksystemlog/src/modes/system/CMakeLists.txt @@ -15,7 +15,7 @@ set(ksystemlog_system_sources systemLogMode.cpp ) -kde4_add_library(ksystemlog_system STATIC ${ksystemlog_system_sources}) +add_library(ksystemlog_system STATIC ${ksystemlog_system_sources}) add_dependencies( ksystemlog_system diff --git a/ksystemlog/src/modes/xorg/CMakeLists.txt b/ksystemlog/src/modes/xorg/CMakeLists.txt index 07110071..80cc820f 100644 --- a/ksystemlog/src/modes/xorg/CMakeLists.txt +++ b/ksystemlog/src/modes/xorg/CMakeLists.txt @@ -17,7 +17,7 @@ set(ksystemlog_xorg_sources xorgFactory.cpp ) -kde4_add_library(ksystemlog_xorg STATIC ${ksystemlog_xorg_sources}) +add_library(ksystemlog_xorg STATIC ${ksystemlog_xorg_sources}) add_dependencies( ksystemlog_xorg diff --git a/ksystemlog/src/modes/xsession/CMakeLists.txt b/ksystemlog/src/modes/xsession/CMakeLists.txt index cf17e7ca..a52414a6 100644 --- a/ksystemlog/src/modes/xsession/CMakeLists.txt +++ b/ksystemlog/src/modes/xsession/CMakeLists.txt @@ -15,11 +15,10 @@ set(ksystemlog_xsession_sources xsessionItemBuilder.cpp xsessionLogMode.cpp xsessionFactory.cpp + xsessionConfigurationWidgetBase.ui ) -kde4_add_ui_files(ksystemlog_xsession_sources xsessionConfigurationWidgetBase.ui ) - -kde4_add_library(ksystemlog_xsession STATIC ${ksystemlog_xsession_sources}) +add_library(ksystemlog_xsession STATIC ${ksystemlog_xsession_sources}) add_dependencies( ksystemlog_xsession diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt index 2a3ffec4..c7146fce 100644 --- a/ktimer/CMakeLists.txt +++ b/ktimer/CMakeLists.txt @@ -16,13 +16,9 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} ) endif() -set(ktimer_SRCS main.cpp ktimer.cpp ) +set(ktimer_SRCS main.cpp ktimer.cpp prefwidget.ui ) -kde4_add_ui_files(ktimer_SRCS prefwidget.ui ) - -kde4_add_app_icon(ktimer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-ktimer.png") - -kde4_add_executable(ktimer ${ktimer_SRCS}) +add_executable(ktimer ${ktimer_SRCS}) target_link_libraries(ktimer ${KDE4_KIO_LIBS}) diff --git a/kuser/CMakeLists.txt b/kuser/CMakeLists.txt index 31a06ad4..b0d67293 100644 --- a/kuser/CMakeLists.txt +++ b/kuser/CMakeLists.txt @@ -73,13 +73,14 @@ set(kuser_SRCS ku_usersystem.cpp ku_groupsystem.cpp ku_selectconn.cpp + ku_filessettings.ui + ku_generalsettings.ui + ku_passwordpolicy.ui ) kde4_add_kcfg_files(kuser_SRCS ku_prefs.kcfgc) -kde4_add_ui_files(kuser_SRCS ku_filessettings.ui ku_generalsettings.ui ku_passwordpolicy.ui) - -kde4_add_executable(kuser ${kuser_SRCS}) +add_executable(kuser ${kuser_SRCS}) target_link_libraries(kuser ${KDE4_KIO_LIBS} ${KDE4_KLDAP_LIBS} kntlm) if(HAVE_CRYPT_LIBRARY) diff --git a/kuser/ChangeLog b/kuser/ChangeLog deleted file mode 100644 index 9457e68c..00000000 --- a/kuser/ChangeLog +++ /dev/null @@ -1,47 +0,0 @@ -29/04/2000: Simplified quota.cpp(becames 2 times smaller). Please test it. -28/04/2000: Move KUser to actions. - User is shown in delete user message box. - Use operator[] for list item access. - Use & instead of pointers to objects (cosy for []). - Rename mainDlg to mainView. - Move all global objects out of mainView. -24/03/2000: Move quota ifdef code to kuqconf.h. - Error messages are without flags now. -12/07/1999: fgetpwent/getpwent/fgetgrent/getgrent issue fixed (FreeBSD have no - fxx funcs. Thanks to Hans Petter Bieker . -24/04/1999: change _KU_FIRST_USER to KU_FIRST_USER, and put a define for it into - globals.h -24/04/1999: Bug 'Group properties did show nothing in 'Other Users' listbox.' - fixed, documentation in SGML created. -23/04/1999: User create and delete postpone logic implemented. -04/04/1999: Bug #1133 'new fixes dont create new user home directory anymore' -01/04/1999: Bug #895 'Kuser doesn't restore the permissions on /etc/shadow.' - -19990328: added #ifdef's to kuser.cpp and kgroup.cpp so that if - _KU_FIRST_USER is defined to be, say, 500, then UID's and GID's - for regular users start at 500. If _KU_FIRST_USER is not defined, - they start at 1001, the default, as before. _KU_FIRST_USER can - be defined in kdeadmin/config.h. (This is to make it easy to - compile kuser for compatibitlity with RedHat, where regular users - start at UID 500, and the User Private Group scheme is used for - GID's.) - - -22/12/98: RedHat awared issues added. - Private group mechanism implemented. Works both for - add and delete. - -12/10/98: Simple property dialog added - -04/10/98: Use layouts in Edit group dialog (QtArch is rulez!!!) - -04/10/98: Patch by Rudolf Weber incorporated in part - if NIS support. - NIS support. - It is possible to create homedir when adding user. - It is possible to create mailbox when adding user. - It is possible to remove homedir when removing user. - It is possible to remove processes when removing user. - It is possible to remove crontabs when removing user. - It is possible to remove mailbox when removing user. - Preferences dialog added. diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt index 76f6946f..17f8374f 100644 --- a/kvkbd/src/CMakeLists.txt +++ b/kvkbd/src/CMakeLists.txt @@ -33,7 +33,7 @@ QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Kvkbd.xml QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Dock.xml kbddock.h KbdDock) -kde4_add_executable(kvkbd ${kvkbd_SRCS} ${kvkbd_RC_SRCS} ${kvkbd_RESOURCES_RCC}) +add_executable(kvkbd ${kvkbd_SRCS} ${kvkbd_RC_SRCS} ${kvkbd_RESOURCES_RCC}) target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} X11 Xtst) diff --git a/libksane/libksane/CMakeLists.txt b/libksane/libksane/CMakeLists.txt index 0798bcff..5daaf6b6 100644 --- a/libksane/libksane/CMakeLists.txt +++ b/libksane/libksane/CMakeLists.txt @@ -34,7 +34,7 @@ SET(ksane_LIB_SRCS options/ksane_opt_combo.cpp ) -KDE4_ADD_LIBRARY(ksane SHARED ${ksane_LIB_SRCS}) +add_library(ksane SHARED ${ksane_LIB_SRCS}) TARGET_LINK_LIBRARIES(ksane ${KDE4_KDEUI_LIBS} ${SANE_LIBRARY} @@ -46,7 +46,7 @@ OPTION(COMPILE_VIEWER_TESTAPP "Compile a small test application for the viewer") IF (COMPILE_VIEWER_TESTAPP) message("Compile testapp") - kde4_add_executable(viewer_test ksane_viewer.cpp ksane_viewer_test.cpp selectionitem.cpp) + add_executable(viewer_test ksane_viewer.cpp ksane_viewer_test.cpp selectionitem.cpp) target_link_libraries(viewer_test ${KDE4_KDEUI_LIBS}) ENDIF() diff --git a/libkscreen/CMakeLists.txt b/libkscreen/CMakeLists.txt index 266fcc0e..4bebbfaa 100644 --- a/libkscreen/CMakeLists.txt +++ b/libkscreen/CMakeLists.txt @@ -63,7 +63,9 @@ include_directories(${PROJECT_SOURCE_DIR}/src ${CMAKE_BINARY_DIR} ${CMAKE_CURREN add_subdirectory(src) add_subdirectory(backends) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() configure_file(${libkscreen_SOURCE_DIR}/LibKScreenConfig.cmake.in ${libkscreen_BINARY_DIR}/LibKScreenConfig.cmake diff --git a/libktorrent/examples/ktcli/CMakeLists.txt b/libktorrent/examples/ktcli/CMakeLists.txt index 6a12731a..47e9569b 100644 --- a/libktorrent/examples/ktcli/CMakeLists.txt +++ b/libktorrent/examples/ktcli/CMakeLists.txt @@ -5,5 +5,5 @@ set(ktcli_SRC main.cpp ) -kde4_add_executable(ktcli ${ktcli_SRC}) +add_executable(ktcli ${ktcli_SRC}) target_link_libraries(ktcli ktorrent ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS}) diff --git a/libktorrent/src/CMakeLists.txt b/libktorrent/src/CMakeLists.txt index 45c35888..1168b2aa 100644 --- a/libktorrent/src/CMakeLists.txt +++ b/libktorrent/src/CMakeLists.txt @@ -217,7 +217,7 @@ set(libktorrent_SRC # kde4_add_ui_files(libktorrent_SRC ${libktorrent_UI}) # kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc) -kde4_add_library(ktorrent SHARED ${libktorrent_SRC}) +add_library(ktorrent SHARED ${libktorrent_SRC}) target_link_libraries(ktorrent PRIVATE ${KDE4_KIO_LIBS} ${GMP_LIBRARIES} ${KDE4_SOLID_LIBS} ${LIBGCRYPT_LIBRARIES} ${QCA2_LIBRARIES}) target_link_libraries(ktorrent PUBLIC ${KDE4_KDEUI_LIBS}) diff --git a/libktorrent/src/datachecker/CMakeLists.txt b/libktorrent/src/datachecker/CMakeLists.txt index b327fcb7..d0aa6c07 100644 --- a/libktorrent/src/datachecker/CMakeLists.txt +++ b/libktorrent/src/datachecker/CMakeLists.txt @@ -1,11 +1,16 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (datachecker_HDR - ./datacheckerthread.h - ./datachecker.h - ./singledatachecker.h - ./multidatachecker.h - ./datacheckerjob.h + datacheckerthread.h + datachecker.h + singledatachecker.h + multidatachecker.h + datacheckerjob.h ) -install(FILES ${datachecker_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/datachecker COMPONENT Devel) \ No newline at end of file +install(FILES ${datachecker_HDR} + DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/datachecker + COMPONENT Devel +) \ No newline at end of file diff --git a/libktorrent/src/dht/CMakeLists.txt b/libktorrent/src/dht/CMakeLists.txt index 7c05ac90..320e7567 100644 --- a/libktorrent/src/dht/CMakeLists.txt +++ b/libktorrent/src/dht/CMakeLists.txt @@ -1,34 +1,36 @@ set (dht_HDR - dhtbase.h - rpcserver.h - rpcserverinterface.h - key.h - pack.h - rpcmsg.h - dhtpeersource.h - announcetask.h - rpccall.h - kclosestnodessearch.h - dht.h - node.h - task.h - nodelookup.h - taskmanager.h - kbucket.h - kbucketentry.h - kbuckettable.h - database.h - announcereq.h - announcersp.h - pingreq.h - pingrsp.h - findnodereq.h - findnodersp.h - getpeersreq.h - getpeersrsp.h - rpcmsgfactory.h + dhtbase.h + rpcserver.h + rpcserverinterface.h + key.h + pack.h + rpcmsg.h + dhtpeersource.h + announcetask.h + rpccall.h + kclosestnodessearch.h + dht.h + node.h + task.h + nodelookup.h + taskmanager.h + kbucket.h + kbucketentry.h + kbuckettable.h + database.h + announcereq.h + announcersp.h + pingreq.h + pingrsp.h + findnodereq.h + findnodersp.h + getpeersreq.h + getpeersrsp.h + rpcmsgfactory.h ) install(FILES ${dht_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/dht COMPONENT Devel) -add_subdirectory(tests) \ No newline at end of file +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() \ No newline at end of file diff --git a/libktorrent/src/diskio/CMakeLists.txt b/libktorrent/src/diskio/CMakeLists.txt index cae77cbf..e3cb9ad9 100644 --- a/libktorrent/src/diskio/CMakeLists.txt +++ b/libktorrent/src/diskio/CMakeLists.txt @@ -1,18 +1,20 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (diskio_HDR - cache.h - cachefile.h - singlefilecache.h - preallocationthread.h - preallocationjob.h - movedatafilesjob.h - deletedatafilesjob.h - chunkmanager.h - dndfile.h - chunk.h - multifilecache.h - piecedata.h + cache.h + cachefile.h + singlefilecache.h + preallocationthread.h + preallocationjob.h + movedatafilesjob.h + deletedatafilesjob.h + chunkmanager.h + dndfile.h + chunk.h + multifilecache.h + piecedata.h ) install(FILES ${diskio_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/diskio COMPONENT Devel) \ No newline at end of file diff --git a/libktorrent/src/download/CMakeLists.txt b/libktorrent/src/download/CMakeLists.txt index 33005cdc..7b687b81 100644 --- a/libktorrent/src/download/CMakeLists.txt +++ b/libktorrent/src/download/CMakeLists.txt @@ -1,13 +1,18 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (download_HDR - chunkdownload.h - downloader.h - request.h - piece.h - packet.h - chunkselector.h - webseed.h + chunkdownload.h + downloader.h + request.h + piece.h + packet.h + chunkselector.h + webseed.h ) -install(FILES ${download_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/download COMPONENT Devel) \ No newline at end of file +install(FILES ${download_HDR} + DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/download + COMPONENT Devel +) \ No newline at end of file diff --git a/libktorrent/src/magnet/CMakeLists.txt b/libktorrent/src/magnet/CMakeLists.txt index d771e286..d9c3c0f2 100644 --- a/libktorrent/src/magnet/CMakeLists.txt +++ b/libktorrent/src/magnet/CMakeLists.txt @@ -1,9 +1,11 @@ +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (magnet_HDR - magnetdownloader.h - magnetlink.h - metadatadownload.h + magnetdownloader.h + magnetlink.h + metadatadownload.h ) install(FILES ${magnet_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/magnet COMPONENT Devel) -add_subdirectory(tests) \ No newline at end of file diff --git a/libktorrent/src/mse/CMakeLists.txt b/libktorrent/src/mse/CMakeLists.txt index e2e4ffff..1b2a3225 100644 --- a/libktorrent/src/mse/CMakeLists.txt +++ b/libktorrent/src/mse/CMakeLists.txt @@ -1,12 +1,14 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (mse_HDR - ./encryptedserverauthenticate.h - ./functions.h - ./rc4encryptor.h - ./encryptedauthenticate.h - ./bigint.h - ./encryptedpacketsocket.h + encryptedserverauthenticate.h + functions.h + rc4encryptor.h + encryptedauthenticate.h + bigint.h + encryptedpacketsocket.h ) install(FILES ${mse_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/mse COMPONENT Devel) \ No newline at end of file diff --git a/libktorrent/src/net/CMakeLists.txt b/libktorrent/src/net/CMakeLists.txt index 0b09b1fc..655ce6a4 100644 --- a/libktorrent/src/net/CMakeLists.txt +++ b/libktorrent/src/net/CMakeLists.txt @@ -1,26 +1,27 @@ - -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(net_HDR - socks.h - packetsocket.h - trafficshapedsocket.h - streamsocket.h - downloadthread.h - address.h - addressresolver.h - socketgroup.h - portlist.h - networkthread.h - socket.h - speed.h - uploadthread.h - socketmonitor.h - reverseresolver.h - socketdevice.h - poll.h - wakeuppipe.h - serversocket.h + socks.h + packetsocket.h + trafficshapedsocket.h + streamsocket.h + downloadthread.h + address.h + addressresolver.h + socketgroup.h + portlist.h + networkthread.h + socket.h + speed.h + uploadthread.h + socketmonitor.h + reverseresolver.h + socketdevice.h + poll.h + wakeuppipe.h + serversocket.h ) install(FILES ${net_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/net COMPONENT Devel) diff --git a/libktorrent/src/peer/CMakeLists.txt b/libktorrent/src/peer/CMakeLists.txt index 029b9280..175b8eec 100644 --- a/libktorrent/src/peer/CMakeLists.txt +++ b/libktorrent/src/peer/CMakeLists.txt @@ -1,25 +1,27 @@ set (peer_HDR - peeruploader.h - peer.h - peermanager.h - authenticatebase.h - authenticate.h - peerprotocolextension.h - utpex.h - utmetadata.h - packetreader.h - authenticationmonitor.h - peerid.h - peerdownloader.h - chunkcounter.h - serverauthenticate.h - accessmanager.h - peerconnector.h - superseeder.h - connectionlimit.h + peeruploader.h + peer.h + peermanager.h + authenticatebase.h + authenticate.h + peerprotocolextension.h + utpex.h + utmetadata.h + packetreader.h + authenticationmonitor.h + peerid.h + peerdownloader.h + chunkcounter.h + serverauthenticate.h + accessmanager.h + peerconnector.h + superseeder.h + connectionlimit.h ) install(FILES ${peer_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/peer COMPONENT Devel) -add_subdirectory(tests) \ No newline at end of file +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() \ No newline at end of file diff --git a/libktorrent/src/torrent/CMakeLists.txt b/libktorrent/src/torrent/CMakeLists.txt index 8a4695ac..277f4213 100644 --- a/libktorrent/src/torrent/CMakeLists.txt +++ b/libktorrent/src/torrent/CMakeLists.txt @@ -1,22 +1,24 @@ -set (torrent_HDR - torrent.h - advancedchokealgorithm.h - peersourcemanager.h - choker.h - server.h - torrentcontrol.h - uploader.h - torrentcreator.h - timeestimator.h - torrentfile.h - statsfile.h - globals.h - torrentstats.h - job.h - jobqueue.h - torrentfilestream.h +set(torrent_HDR + torrent.h + advancedchokealgorithm.h + peersourcemanager.h + choker.h + server.h + torrentcontrol.h + uploader.h + torrentcreator.h + timeestimator.h + torrentfile.h + statsfile.h + globals.h + torrentstats.h + job.h + jobqueue.h + torrentfilestream.h ) install(FILES ${torrent_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/torrent COMPONENT Devel) -add_subdirectory(tests) \ No newline at end of file +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/libktorrent/src/util/CMakeLists.txt b/libktorrent/src/util/CMakeLists.txt index b8d6ad11..78fa0d48 100644 --- a/libktorrent/src/util/CMakeLists.txt +++ b/libktorrent/src/util/CMakeLists.txt @@ -1,35 +1,35 @@ -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set (util_HDR - autorotatelogjob.h - fileops.h - timer.h - ptrmap.h - log.h - waitjob.h - urlencoder.h - array.h - functions.h - file.h - constants.h - bitset.h - sha1hash.h - sha1hashgen.h - error.h - win32.h - logsystemmanager.h - compressfilejob.h - decompressfilejob.h - extractfilejob.h - pipe.h - circularbuffer.h - resourcemanager.h - bufferpool.h + autorotatelogjob.h + fileops.h + timer.h + ptrmap.h + log.h + waitjob.h + urlencoder.h + array.h + functions.h + file.h + constants.h + bitset.h + sha1hash.h + sha1hashgen.h + error.h + win32.h + logsystemmanager.h + compressfilejob.h + decompressfilejob.h + extractfilejob.h + pipe.h + circularbuffer.h + resourcemanager.h + bufferpool.h ) -if(NOT WIN32) set (util_HDR ${util_HDR} - signalcatcher.h + signalcatcher.h ) -endif(NOT WIN32) install(FILES ${util_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/util COMPONENT Devel) diff --git a/libktorrent/src/utp/CMakeLists.txt b/libktorrent/src/utp/CMakeLists.txt index 81cc8d01..a7a26920 100644 --- a/libktorrent/src/utp/CMakeLists.txt +++ b/libktorrent/src/utp/CMakeLists.txt @@ -1,17 +1,19 @@ -set (utp_HDR - utpserver.h - utpserverthread.h - utpprotocol.h - utpsocket.h - connection.h - localwindow.h - remotewindow.h - timevalue.h - pollpipe.h - delaywindow.h - packetbuffer.h +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() + +set(utp_HDR + utpserver.h + utpserverthread.h + utpprotocol.h + utpsocket.h + connection.h + localwindow.h + remotewindow.h + timevalue.h + pollpipe.h + delaywindow.h + packetbuffer.h ) install(FILES ${utp_HDR} DESTINATION ${INCLUDE_INSTALL_DIR}/libktorrent/utp COMPONENT Devel) -#add_subdirectory(tests) -add_subdirectory(tests) \ No newline at end of file diff --git a/libktorrent/testlib/CMakeLists.txt b/libktorrent/testlib/CMakeLists.txt index 6146aa89..c091d493 100644 --- a/libktorrent/testlib/CMakeLists.txt +++ b/libktorrent/testlib/CMakeLists.txt @@ -5,4 +5,4 @@ set(testlib_SRC dummytorrentcreator.cpp ) -kde4_add_library(testlib STATIC ${testlib_SRC}) +add_library(testlib STATIC ${testlib_SRC}) diff --git a/lokalize/src/CMakeLists.txt b/lokalize/src/CMakeLists.txt index 8c7aada7..0b15f186 100644 --- a/lokalize/src/CMakeLists.txt +++ b/lokalize/src/CMakeLists.txt @@ -109,9 +109,7 @@ set(lokalize_SRCS catalog/gettext/gettextexport.cpp catalog/xliff/xliffstorage.cpp catalog/ts/tsstorage.cpp -) -kde4_add_ui_files(lokalize_SRCS prefs/prefs_identity.ui prefs/prefs_editor.ui prefs/prefs_appearance.ui @@ -151,10 +149,7 @@ qt4_add_dbus_adaptor(lokalize_SRCS project/org.kde.lokalize.ProjectOverview.xml project/projecttab.h ProjectTab) - -kde4_add_app_icon(lokalize_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-lokalize.png") - -kde4_add_executable(lokalize ${lokalize_SRCS}) +add_executable(lokalize ${lokalize_SRCS}) target_link_libraries(lokalize ${KDE4_KPARTS_LIBS} diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt index 08dbed81..26a3f015 100644 --- a/okular/CMakeLists.txt +++ b/okular/CMakeLists.txt @@ -25,7 +25,10 @@ add_subdirectory( plasma ) add_subdirectory( ui ) add_subdirectory( shell ) add_subdirectory( generators ) -add_subdirectory( tests ) + +if(ENABLE_TESTING) + add_subdirectory( tests ) +endif() include(OkularConfigureChecks.cmake) include(MacroWriteBasicCMakeVersionFile) @@ -64,10 +67,8 @@ set(okularcore_SRCS core/utils.cpp core/view.cpp core/fileprinter.cpp -) - -kde4_add_ui_files(okularcore_SRCS conf/textdocumentsettings.ui + core/chooseenginewidget.ui ) install( FILES @@ -104,13 +105,9 @@ install( FILES interfaces/viewerinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/okular/interfaces COMPONENT Devel) -kde4_add_ui_files(okularcore_SRCS - core/chooseenginewidget.ui -) - kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcfgc ) -kde4_add_library(okularcore SHARED ${okularcore_SRCS}) +add_library(okularcore SHARED ${okularcore_SRCS}) target_link_libraries(okularcore ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} ) @@ -175,9 +172,6 @@ set(okularpart_SRCS ui/toolaction.cpp ui/tts.cpp ui/videowidget.cpp -) - -kde4_add_ui_files(okularpart_SRCS conf/dlgaccessibilitybase.ui conf/dlgeditorbase.ui conf/dlggeneralbase.ui diff --git a/okular/generators/kimgio/CMakeLists.txt b/okular/generators/kimgio/CMakeLists.txt index 43c39b52..3fae2cb8 100644 --- a/okular/generators/kimgio/CMakeLists.txt +++ b/okular/generators/kimgio/CMakeLists.txt @@ -15,11 +15,23 @@ kde4_add_plugin(okularGenerator_kimgio ${okularGenerator_kimgio_PART_SRCS}) target_link_libraries(okularGenerator_kimgio okularcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KEXIV2_LIBRARIES} ) install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR}) -set( kimgiotest_SRCS tests/kimgiotest.cpp ${PROJECT_SOURCE_DIR}/ui/pagepainter.cpp ${PROJECT_SOURCE_DIR}/ui/guiutils.cpp ) -kde4_add_kcfg_files( kimgiotest_SRCS ${PROJECT_SOURCE_DIR}/conf/settings.kcfgc ) -kde4_add_unit_test( kimgiotest ${kimgiotest_SRCS} ) -target_link_libraries( kimgiotest ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QIMAGEBLITZ_LIBRARIES} okularcore ) - +if(ENABLE_TESTING) + set( kimgiotest_SRCS tests/kimgiotest.cpp + ${PROJECT_SOURCE_DIR}/ui/pagepainter.cpp + ${PROJECT_SOURCE_DIR}/ui/guiutils.cpp + ) + kde4_add_kcfg_files(kimgiotest_SRCS ${PROJECT_SOURCE_DIR}/conf/settings.kcfgc ) + kde4_add_test( kimgiotest ${kimgiotest_SRCS}) + target_link_libraries(kimgiotest + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} + ${QT_QTGUI_LIBRARY} + ${QT_QTTEST_LIBRARY} + ${QIMAGEBLITZ_LIBRARIES} + okularcore + ) +endif() ########### install files ############### diff --git a/okular/generators/poppler/CMakeLists.txt b/okular/generators/poppler/CMakeLists.txt index 48496552..4f03a20e 100644 --- a/okular/generators/poppler/CMakeLists.txt +++ b/okular/generators/poppler/CMakeLists.txt @@ -34,9 +34,6 @@ set(okularGenerator_poppler_PART_SRCS annots.cpp synctex/synctex_parser.c synctex/synctex_parser_utils.c -) - -kde4_add_ui_files(okularGenerator_poppler_PART_SRCS conf/pdfsettingswidget.ui ) diff --git a/okular/generators/spectre/CMakeLists.txt b/okular/generators/spectre/CMakeLists.txt index 617047a7..122e9788 100644 --- a/okular/generators/spectre/CMakeLists.txt +++ b/okular/generators/spectre/CMakeLists.txt @@ -11,9 +11,6 @@ include_directories( set(okularGenerator_ghostview_SRCS generator_ghostview.cpp rendererthread.cpp -) - -kde4_add_ui_files(okularGenerator_ghostview_SRCS conf/gssettingswidget.ui ) diff --git a/okular/plasma/components/CMakeLists.txt b/okular/plasma/components/CMakeLists.txt index e3b23177..09ea9eaf 100644 --- a/okular/plasma/components/CMakeLists.txt +++ b/okular/plasma/components/CMakeLists.txt @@ -21,7 +21,7 @@ kde4_add_kcfg_files(okular_SRCS ${PROJECT_SOURCE_DIR}/conf/settings.kcfgc ) qt4_automoc(${okular_SRCS}) -kde4_add_library(okularplugin SHARED ${okular_SRCS}) +add_library(okularplugin SHARED ${okular_SRCS}) target_link_libraries(okularplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} diff --git a/okular/shell/CMakeLists.txt b/okular/shell/CMakeLists.txt index bf34f648..4751e01b 100644 --- a/okular/shell/CMakeLists.txt +++ b/okular/shell/CMakeLists.txt @@ -12,9 +12,7 @@ set(okular_SRCS shellutils.cpp ) -kde4_add_app_icon(okular_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/hi*-apps-okular.png") - -kde4_add_executable(okular ${okular_SRCS}) +add_executable(okular ${okular_SRCS}) target_link_libraries(okular ${KDE4_KPARTS_LIBS}) diff --git a/partitionmanager/src/CMakeLists.txt b/partitionmanager/src/CMakeLists.txt index e02b47ad..eb3fbb45 100644 --- a/partitionmanager/src/CMakeLists.txt +++ b/partitionmanager/src/CMakeLists.txt @@ -30,11 +30,9 @@ file(GLOB partitionmanagerprivate_SRCS file(GLOB partitionmanagerprivate_UIFILES config/*.ui gui/*.ui) -kde4_add_ui_files(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES}) - kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc) -kde4_add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS}) +add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS} ${partitionmanagerprivate_UIFILES}) target_link_libraries(partitionmanagerprivate libfatlabel ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS}) @@ -44,9 +42,7 @@ install(TARGETS partitionmanagerprivate ${INSTALL_TARGETS_DEFAULT_ARGS}) file(GLOB partitionmanager_SRCS main.cpp) -kde4_add_app_icon(partitionmanager_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-partitionmanager.png") - -kde4_add_executable(partitionmanager ${partitionmanager_SRCS}) +add_executable(partitionmanager ${partitionmanager_SRCS}) target_link_libraries(partitionmanager partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS}) diff --git a/plasma-nm/editor/CMakeLists.txt b/plasma-nm/editor/CMakeLists.txt index 3d01c379..6be29bae 100644 --- a/plasma-nm/editor/CMakeLists.txt +++ b/plasma-nm/editor/CMakeLists.txt @@ -3,17 +3,12 @@ include_directories(${PROJECT_SOURCE_DIR}/libs/editor ${PROJECT_SOURCE_DIR}/libs/models) set(connectioneditor_SRCS - main.cpp - connectioneditor.cpp + main.cpp + connectioneditor.cpp + connectioneditor.ui ) -kde4_add_app_icon(connectioneditor_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/devices/network-defaultroute.png" ) - -kde4_add_ui_files(connectioneditor_SRCS - ui/connectioneditor.ui -) - -kde4_add_executable(kde-nm-connection-editor ${connectioneditor_SRCS}) +add_executable(kde-nm-connection-editor ${connectioneditor_SRCS}) target_link_libraries(kde-nm-connection-editor plasmanetworkmanagement-internal diff --git a/plasma-nm/editor/ui/connectioneditor.ui b/plasma-nm/editor/connectioneditor.ui similarity index 100% rename from plasma-nm/editor/ui/connectioneditor.ui rename to plasma-nm/editor/connectioneditor.ui diff --git a/plasma-nm/kded/CMakeLists.txt b/plasma-nm/kded/CMakeLists.txt index 56868fe0..7c3a1a78 100644 --- a/plasma-nm/kded/CMakeLists.txt +++ b/plasma-nm/kded/CMakeLists.txt @@ -9,8 +9,6 @@ if (WITH_MODEMMANAGER_SUPPORT) bluetoothmonitor.cpp modemmonitor.cpp pindialog.cpp - ) - kde4_add_ui_files(kded_networkmanagement_SRCS pinwidget.ui passworddialog.ui @@ -22,8 +20,6 @@ else() secretagent.cpp service.cpp bluetoothmonitor.cpp - ) - kde4_add_ui_files(kded_networkmanagement_SRCS passworddialog.ui ) endif() diff --git a/plasma-nm/libs/CMakeLists.txt b/plasma-nm/libs/CMakeLists.txt index 67e89dc4..18fae3b2 100644 --- a/plasma-nm/libs/CMakeLists.txt +++ b/plasma-nm/libs/CMakeLists.txt @@ -12,7 +12,7 @@ set(plasmanetworkmanagement-internal_SRCS uiutils.cpp ) -kde4_add_library(plasmanetworkmanagement-internal SHARED ${plasmanetworkmanagement-internal_SRCS}) +add_library(plasmanetworkmanagement-internal SHARED ${plasmanetworkmanagement-internal_SRCS}) target_link_libraries(plasmanetworkmanagement-internal plasmanetworkmanagement-editor diff --git a/plasma-nm/libs/declarative/CMakeLists.txt b/plasma-nm/libs/declarative/CMakeLists.txt index a586ed02..17a0e7d9 100644 --- a/plasma-nm/libs/declarative/CMakeLists.txt +++ b/plasma-nm/libs/declarative/CMakeLists.txt @@ -11,7 +11,7 @@ set(plasma_networkmanagement_qml_plugins_SRCS qmlplugins.cpp ) -kde4_add_library(plasmanetworkmanagementplugins SHARED ${plasma_networkmanagement_qml_plugins_SRCS}) +add_library(plasmanetworkmanagementplugins SHARED ${plasma_networkmanagement_qml_plugins_SRCS}) target_link_libraries(plasmanetworkmanagementplugins plasmanetworkmanagement-internal diff --git a/plasma-nm/libs/editor/CMakeLists.txt b/plasma-nm/libs/editor/CMakeLists.txt index d81d3b79..273bdb8f 100644 --- a/plasma-nm/libs/editor/CMakeLists.txt +++ b/plasma-nm/libs/editor/CMakeLists.txt @@ -38,16 +38,7 @@ set(plasmanetworkmanagement_libeditor_SRCS vpnuiplugin.cpp ../uiutils.cpp -) - -if (WITH_MODEMMANAGER_SUPPORT) - set(plasmanetworkmanagement_libeditor_SRCS - ${plasmanetworkmanagement_libeditor_SRCS} - widgets/mobileconnectionwizard.cpp - mobileproviders.cpp) -endif() -kde4_add_ui_files(plasmanetworkmanagement_libeditor_SRCS settings/ui/802-1x.ui settings/ui/bond.ui settings/ui/bridge.ui @@ -74,7 +65,15 @@ kde4_add_ui_files(plasmanetworkmanagement_libeditor_SRCS connectiondetaileditor.ui ) -kde4_add_library(plasmanetworkmanagement-editor SHARED ${plasmanetworkmanagement_libeditor_SRCS}) +if (WITH_MODEMMANAGER_SUPPORT) + set(plasmanetworkmanagement_libeditor_SRCS + ${plasmanetworkmanagement_libeditor_SRCS} + widgets/mobileconnectionwizard.cpp + mobileproviders.cpp) +endif() + + +add_library(plasmanetworkmanagement-editor SHARED ${plasmanetworkmanagement_libeditor_SRCS}) target_link_libraries(plasmanetworkmanagement-editor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} diff --git a/plasma-nm/settings/details/CMakeLists.txt b/plasma-nm/settings/details/CMakeLists.txt index 44685377..bb1610b7 100644 --- a/plasma-nm/settings/details/CMakeLists.txt +++ b/plasma-nm/settings/details/CMakeLists.txt @@ -1,9 +1,6 @@ set(plasmanetworkmanagement_config_widgets_SRCS detailkeyseditor.cpp detailkeyseditordesignfactory.cpp -) - -kde4_add_ui_files(plasmanetworkmanagement_config_widgets_SRCS detailkeyswidget.ui ) diff --git a/plasma-nm/vpn/l2tp/CMakeLists.txt b/plasma-nm/vpn/l2tp/CMakeLists.txt index 15c83c8c..1797ea45 100644 --- a/plasma-nm/vpn/l2tp/CMakeLists.txt +++ b/plasma-nm/vpn/l2tp/CMakeLists.txt @@ -4,10 +4,12 @@ set(l2tp_SRCS l2tpauth.cpp l2tpadvancedwidget.cpp l2tppppwidget.cpp + l2tp.ui + l2tpadvanced.ui + l2tpauth.ui + l2tpppp.ui ) -kde4_add_ui_files(l2tp_SRCS l2tp.ui l2tpadvanced.ui l2tpauth.ui l2tpppp.ui) - kde4_add_plugin(plasmanetworkmanagement_l2tpui ${l2tp_SRCS}) target_link_libraries(plasmanetworkmanagement_l2tpui plasmanetworkmanagement-editor ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS}) diff --git a/plasma-nm/vpn/openswan/CMakeLists.txt b/plasma-nm/vpn/openswan/CMakeLists.txt index 67cf3dd0..8cf585d6 100644 --- a/plasma-nm/vpn/openswan/CMakeLists.txt +++ b/plasma-nm/vpn/openswan/CMakeLists.txt @@ -2,10 +2,10 @@ set(openswan_SRCS openswan.cpp openswanwidget.cpp openswanauth.cpp + openswan.ui + openswanauth.ui ) -kde4_add_ui_files(openswan_SRCS openswan.ui openswanauth.ui) - kde4_add_plugin(plasmanetworkmanagement_openswanui ${openswan_SRCS}) target_link_libraries(plasmanetworkmanagement_openswanui plasmanetworkmanagement-editor ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS}) diff --git a/plasma-nm/vpn/openvpn/CMakeLists.txt b/plasma-nm/vpn/openvpn/CMakeLists.txt index 2c14ae31..a6ae4aac 100644 --- a/plasma-nm/vpn/openvpn/CMakeLists.txt +++ b/plasma-nm/vpn/openvpn/CMakeLists.txt @@ -3,10 +3,11 @@ set(openvpn_SRCS openvpnwidget.cpp openvpnauth.cpp openvpnadvancedwidget.cpp + openvpn.ui + openvpnauth.ui + openvpnadvanced.ui ) -kde4_add_ui_files(openvpn_SRCS openvpn.ui openvpnauth.ui openvpnadvanced.ui) - kde4_add_plugin(plasmanetworkmanagement_openvpnui ${openvpn_SRCS}) target_link_libraries(plasmanetworkmanagement_openvpnui plasmanetworkmanagement-editor ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS}) diff --git a/plasma-nm/vpn/pptp/CMakeLists.txt b/plasma-nm/vpn/pptp/CMakeLists.txt index 2d626014..1f3dccf1 100644 --- a/plasma-nm/vpn/pptp/CMakeLists.txt +++ b/plasma-nm/vpn/pptp/CMakeLists.txt @@ -1,10 +1,11 @@ set(pptp_SRCS - pptp.cpp - pptpwidget.cpp - pptpauth.cpp - ) - -kde4_add_ui_files(pptp_SRCS pptpprop.ui pptpadvanced.ui pptpauth.ui) + pptp.cpp + pptpwidget.cpp + pptpauth.cpp + pptpprop.ui + pptpadvanced.ui + pptpauth.ui +) kde4_add_plugin(plasmanetworkmanagement_pptpui ${pptp_SRCS}) diff --git a/plasma-nm/vpn/strongswan/CMakeLists.txt b/plasma-nm/vpn/strongswan/CMakeLists.txt index 54b16a89..82e4b20c 100644 --- a/plasma-nm/vpn/strongswan/CMakeLists.txt +++ b/plasma-nm/vpn/strongswan/CMakeLists.txt @@ -1,10 +1,10 @@ set(strongswan_SRCS - strongswan.cpp - strongswanwidget.cpp - strongswanauth.cpp - ) - -kde4_add_ui_files(strongswan_SRCS strongswanprop.ui strongswanauth.ui) + strongswan.cpp + strongswanwidget.cpp + strongswanauth.cpp + strongswanprop.ui + strongswanauth.ui +) kde4_add_plugin(plasmanetworkmanagement_strongswanui ${strongswan_SRCS}) diff --git a/plasma-nm/vpn/vpnc/CMakeLists.txt b/plasma-nm/vpn/vpnc/CMakeLists.txt index 327e28b7..1621ed5a 100644 --- a/plasma-nm/vpn/vpnc/CMakeLists.txt +++ b/plasma-nm/vpn/vpnc/CMakeLists.txt @@ -3,10 +3,11 @@ set(vpnc_SRCS vpncwidget.cpp vpncadvancedwidget.cpp vpncauth.cpp + vpnc.ui + vpncadvanced.ui + vpncauth.ui ) -kde4_add_ui_files(vpnc_SRCS vpnc.ui vpncadvanced.ui vpncauth.ui) - kde4_add_plugin(plasmanetworkmanagement_vpncui ${vpnc_SRCS}) target_link_libraries(plasmanetworkmanagement_vpncui plasmanetworkmanagement-editor ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS}) diff --git a/print-manager/add-printer/CMakeLists.txt b/print-manager/add-printer/CMakeLists.txt index a7ed0340..0764bc24 100644 --- a/print-manager/add-printer/CMakeLists.txt +++ b/print-manager/add-printer/CMakeLists.txt @@ -15,9 +15,6 @@ set(addprinter_SRCS PageChoosePPD.cpp PageAddPrinter.cpp AddPrinterAssistant.cpp -) - -kde4_add_ui_files(addprinter_SRCS PageDestinations.ui ChooseLpd.ui ChooseSamba.ui @@ -29,7 +26,7 @@ kde4_add_ui_files(addprinter_SRCS PageAddPrinter.ui ) -kde4_add_executable(kde-add-printer +add_executable(kde-add-printer ${addprinter_SRCS} ) diff --git a/print-manager/configure-printer/CMakeLists.txt b/print-manager/configure-printer/CMakeLists.txt index 5cb1dd06..9884beff 100644 --- a/print-manager/configure-printer/CMakeLists.txt +++ b/print-manager/configure-printer/CMakeLists.txt @@ -7,9 +7,6 @@ set(configureprinter_SRCS ConfigureDialog.cpp ConfigurePrinter.cpp main.cpp -) - -kde4_add_ui_files(configureprinter_SRCS ModifyPrinter.ui PrinterOptions.ui PrinterBehavior.ui @@ -24,7 +21,7 @@ qt4_add_dbus_adaptor(configureprinter_SRCS configure_file(org.kde.ConfigurePrinter.service.in org.kde.ConfigurePrinter.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ConfigurePrinter.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) -kde4_add_executable(configure-printer ${configureprinter_SRCS}) +add_executable(configure-printer ${configureprinter_SRCS}) target_link_libraries(configure-printer ${KDE4_KIO_LIBS} ${CUPS_LIB} diff --git a/print-manager/declarative-plugins/CMakeLists.txt b/print-manager/declarative-plugins/CMakeLists.txt index afc8bced..b419d02c 100644 --- a/print-manager/declarative-plugins/CMakeLists.txt +++ b/print-manager/declarative-plugins/CMakeLists.txt @@ -2,7 +2,7 @@ set(printmanager_qml_plugin_SRCS qmlplugins.cpp ) -kde4_add_library(printmanager SHARED ${printmanager_qml_plugin_SRCS}) +add_library(printmanager SHARED ${printmanager_qml_plugin_SRCS}) target_link_libraries(printmanager ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_PLASMA_LIBS} diff --git a/print-manager/libkcups/CMakeLists.txt b/print-manager/libkcups/CMakeLists.txt index 2e905ca4..745adf63 100644 --- a/print-manager/libkcups/CMakeLists.txt +++ b/print-manager/libkcups/CMakeLists.txt @@ -14,13 +14,10 @@ set(libkcups_SRCS PrinterSortFilterModel.cpp JobModel.cpp JobSortFilterModel.cpp -) - -kde4_add_ui_files(libkcups_SRCS SelectMakeModel.ui ) -kde4_add_library(kcupslib SHARED ${libkcups_SRCS}) +add_library(kcupslib SHARED ${libkcups_SRCS}) target_link_libraries(kcupslib ${KDE4_KIO_LIBS} ${CUPS_LIB} diff --git a/print-manager/printer-manager-kcm/CMakeLists.txt b/print-manager/printer-manager-kcm/CMakeLists.txt index 8c984263..4eb62bf6 100644 --- a/print-manager/printer-manager-kcm/CMakeLists.txt +++ b/print-manager/printer-manager-kcm/CMakeLists.txt @@ -2,9 +2,6 @@ set(kcm_print_SRCS PrinterDelegate.cpp PrinterDescription.cpp PrintKCM.cpp -) - -kde4_add_ui_files(kcm_print_SRCS PrintKCM.ui PrinterDescription.ui ) diff --git a/print-manager/printqueue/CMakeLists.txt b/print-manager/printqueue/CMakeLists.txt index cd7c973c..b5ecf4b5 100644 --- a/print-manager/printqueue/CMakeLists.txt +++ b/print-manager/printqueue/CMakeLists.txt @@ -4,13 +4,10 @@ set(queuemanager_SRCS main.cpp PrintQueue.cpp PrintQueueUi.cpp -) - -kde4_add_ui_files(queuemanager_SRCS PrintQueueUi.ui ) -kde4_add_executable(kde-print-queue +add_executable(kde-print-queue ${queuemanager_SRCS} ) diff --git a/skanlite/src/CMakeLists.txt b/skanlite/src/CMakeLists.txt index baf44a86..ed892e93 100644 --- a/skanlite/src/CMakeLists.txt +++ b/skanlite/src/CMakeLists.txt @@ -1,12 +1,16 @@ include_directories(${CMAKE_SOURCE_DIR}/libksane) -set(skanlite_SRCS main.cpp skanlite.cpp ImageViewer.cpp KSaneImageSaver.cpp SaveLocation.cpp) +set(skanlite_SRCS + main.cpp + skanlite.cpp + ImageViewer.cpp + KSaneImageSaver.cpp + SaveLocation.cpp + settings.ui + SaveLocation.ui +) -kde4_add_ui_files(skanlite_SRCS settings.ui SaveLocation.ui) - -kde4_add_app_icon(skanlite_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/devices/scanner.png") - -kde4_add_executable(skanlite ${skanlite_SRCS}) +add_executable(skanlite ${skanlite_SRCS}) target_link_libraries(skanlite ${KDE4_KIO_LIBS} ${PNG_LIBRARY} ksane) diff --git a/syndication/CMakeLists.txt b/syndication/CMakeLists.txt index 420c715f..88d980d6 100644 --- a/syndication/CMakeLists.txt +++ b/syndication/CMakeLists.txt @@ -1,7 +1,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory( tests ) +endif() add_subdirectory( atom ) add_subdirectory( rdf ) @@ -119,7 +121,7 @@ set(syndication_LIB_SRCS ) -kde4_add_library(syndication ${LIBRARY_TYPE} ${syndication_LIB_SRCS}) +add_library(syndication ${LIBRARY_TYPE} ${syndication_LIB_SRCS}) generate_export_header(syndication EXPORT_FILE_NAME ksyndication_export.h) target_link_libraries(syndication ${KDE4_KIO_LIBS}) diff --git a/syndication/tests/CMakeLists.txt b/syndication/tests/CMakeLists.txt index cbf465cf..3274f1d5 100644 --- a/syndication/tests/CMakeLists.txt +++ b/syndication/tests/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( set(testlibsyndication_SRCS testlibsyndication.cpp ) -kde4_add_executable(testlibsyndication NOGUI TEST ${testlibsyndication_SRCS}) +add_executable(testlibsyndication NOGUI TEST ${testlibsyndication_SRCS}) target_link_libraries(testlibsyndication syndication ${KDE4_KDECORE_LIBS} ) @@ -19,7 +19,7 @@ target_link_libraries(testlibsyndication syndication ${KDE4_KDECORE_LIBS} ) set(testloader_SRCS testloader.cpp ) -kde4_add_executable(testloader TEST ${testloader_SRCS}) +add_executable(testloader TEST ${testloader_SRCS}) target_link_libraries(testloader syndication ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ) diff --git a/thumbnailers/po/CMakeLists.txt b/thumbnailers/po/CMakeLists.txt index 924f4a28..007177a7 100644 --- a/thumbnailers/po/CMakeLists.txt +++ b/thumbnailers/po/CMakeLists.txt @@ -9,9 +9,7 @@ include(KDE4Defaults) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) -set(pothumbnail_SRCS pocreator.cpp) - -kde4_add_ui_files(pothumbnail_SRCS pocreatorform.ui) +set(pothumbnail_SRCS pocreator.cpp pocreatorform.ui) kde4_add_kcfg_files(pothumbnail_SRCS pocreatorsettings.kcfgc) diff --git a/yakuake/app/CMakeLists.txt b/yakuake/app/CMakeLists.txt index 8be45250..ca020e78 100644 --- a/yakuake/app/CMakeLists.txt +++ b/yakuake/app/CMakeLists.txt @@ -16,20 +16,16 @@ set(yakuake_SRCS config/windowsettings.cpp config/appearancesettings.cpp config/skinlistdelegate.cpp -) - -kde4_add_kcfg_files(yakuake_SRCS config/settings.kcfgc) - -kde4_add_ui_files(yakuake_SRCS firstrundialog.ui config/windowsettings.ui config/behaviorsettings.ui config/appearancesettings.ui ) -kde4_add_app_icon(yakuake_SRCS "icons/hi*-app-yakuake.png") -kde4_add_executable(yakuake ${yakuake_SRCS}) +kde4_add_kcfg_files(yakuake_SRCS config/settings.kcfgc) + +add_executable(yakuake ${yakuake_SRCS}) target_link_libraries(yakuake ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}) -- 2.11.0