generic: major build system cleanup

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

akregator/configuration/CMakeLists.txt

@@ -6,9 +6,11 @@ include_directories(
 
 ########### 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
@@ -21,9 +23,11 @@ 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
@@ -36,9 +40,11 @@ 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
@@ -51,9 +57,11 @@ 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
@@ -69,9 +77,9 @@ install(TARGETS akregator_config_browser DESTINATION ${PLUGIN_INSTALL_DIR})
 set(kcm_akradvancedconfig_SRCS
     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

akregator/export/CMakeLists.txt

@@ -9,7 +9,7 @@ include_directories(
 
 set(akregatorstorageexporter_SRCS akregatorstorageexporter.cpp)
 
-kde4_add_executable(akregatorstorageexporter NOGUI ${akregatorstorageexporter_SRCS})
+add_executable(akregatorstorageexporter ${akregatorstorageexporter_SRCS})
 
 target_link_libraries(akregatorstorageexporter
     ${KDE4_KDECORE_LIBS}

akregator/interfaces/CMakeLists.txt

@@ -9,14 +9,16 @@ set(akregatorinterfaces_LIB_SRCS
 
 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
 )
 
-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})

akregator/plugins/sharemicroblog/CMakeLists.txt

@@ -28,10 +28,11 @@ install(FILES akregator_sharemicroblog_plugin.rc DESTINATION ${DATA_INSTALL_DIR}
 
 set(kcm_akrshareconfig_SRCS
     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

akregator/src/CMakeLists.txt

@@ -12,9 +12,7 @@ include_directories(
 
 set(akregator_SRCS main.cpp mainwindow.cpp)
 
-kde4_add_app_icon(akregator_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akregator.png")
+add_executable(akregator ${akregator_SRCS})
-
-kde4_add_executable(akregator ${akregator_SRCS})
 
 target_link_libraries(akregator
     ${KDE4_KPARTS_LIBS}
@@ -50,7 +48,7 @@ set(akregatorprivate_LIB_SRCS
     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}
@@ -102,16 +100,13 @@ set(akregatorpart_PART_SRCS
     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

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} )

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,9 +520,6 @@ 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
+add_library(amaroklib SHARED ${amaroklib_LIB_SRCS} ${AMAROK_MPRIS1_ADAPTOR_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})
 
 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})
+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)
 
 target_link_libraries(amarok ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} amarokcore amaroklib ${X11_LIBRARIES})
 install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS})

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})

amarok/src/context/applets/currenttrack/CMakeLists.txt

@@ -6,13 +6,13 @@ include_directories(
     ${Amarok_SOURCE_DIR}/src
     )
 
-set( currenttrack_SRCS
+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")

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

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

amarok/src/context/applets/photos/CMakeLists.txt

@@ -3,14 +3,13 @@ include_directories(
     ${Amarok_SOURCE_DIR}/src/network
 )
 
-set( photos_applet_SRCS
+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

amarok/src/context/applets/tabs/CMakeLists.txt

@@ -1,9 +1,7 @@
 include_directories( ../..
                     ../../..)
 
-set( tabs_applet_SRCS TabsApplet.cpp TabsView.cpp TabsItem.cpp )
+set( tabs_applet_SRCS TabsApplet.cpp TabsView.cpp TabsItem.cpp TabsSettings.ui ReloadEditDialog.ui )
-
-kde4_add_ui_files( tabs_applet_SRCS TabsSettings.ui ReloadEditDialog.ui )
 kde4_add_plugin( amarok_context_applet_tabs ${tabs_applet_SRCS} )
 target_link_libraries( amarok_context_applet_tabs
     amarokcore

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

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})
 

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(

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}

amarok/src/core-impl/collections/umscollection/CMakeLists.txt

@@ -14,9 +14,7 @@ set(amarok_collection-umscollection_PART_SRCS
     UmsCollectionLocation.cpp
     UmsTranscodeCapability.cpp
     podcasts/UmsPodcastProvider.cpp
-  podcasts/UmsPodcastMeta.cpp)
+    podcasts/UmsPodcastMeta.cpp
-
-kde4_add_ui_files(amarok_collection-umscollection_PART_SRCS
     UmsConfiguration.ui
 )
 

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

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

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} )

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 )
+        set(kcm_amarok_service_ampache_PART_SRCSS
-
+            AddServerDialog.cpp
-        kde4_add_ui_files( kcm_amarok_service_ampache_PART_SRCSS AmpacheConfigWidget.ui NewServerWidget.ui )
+            AmpacheSettings.cpp
-
+            AmpacheConfig.cpp
-
+            AmpacheConfigWidget.ui
-        kde4_add_plugin( kcm_amarok_service_ampache ${kcm_amarok_service_ampache_PART_SRCSS} )
+            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}

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}

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
-target_link_libraries( kcm_amarok_service_magnatunestore  ${KDE4_KUTILS_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBS} )
+    ${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})

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}
             )
 

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

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} )
 

ark/app/CMakeLists.txt

@@ -6,10 +6,7 @@ set(ark_SRCS
     mainwindow.cpp
    )
 
-# For Mac and Windows.
+add_executable( ark ${ark_SRCS} )
-kde4_add_app_icon(ark_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-ark.png")
-
-kde4_add_executable( ark ${ark_SRCS} )
 
 target_link_libraries( ark kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} )
 

ark/kerfuffle/CMakeLists.txt

@@ -12,13 +12,13 @@ set(kerfuffle_SRCS
     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 )
+add_library(kerfuffle SHARED ${kerfuffle_SRCS})
-
-kde4_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 ()

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})

ark/part/CMakeLists.txt

@@ -5,13 +5,11 @@ set(arkpart_PART_SRCS
     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})

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)

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)

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})

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})

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
+add_executable(bluedevil-requestpin ${requestpin_SRCS} ${requestpin_UI})
-                  dialogWidget.ui)
-
-kde4_add_executable(bluedevil-requestpin ${requestpin_SRCS} ${requestpin_UI})
 
 target_link_libraries(bluedevil-requestpin
                       ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS})

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}

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)
 

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)

bluedevil/src/wizard/CMakeLists.txt

@@ -11,9 +11,7 @@ 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
@@ -23,7 +21,7 @@ kde4_add_ui_files(wizard_SRCS
     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)

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)
+add_executable(dragon ${videoplayer_app_SRCS} )
-
-kde4_add_executable(dragon ${videoplayer_app_SRCS} )
 
 target_link_libraries(dragon
     ${KDE4_KIO_LIBS}

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})
 

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")
+add_executable(filelight ${filelight_SRCS})
-
-kde4_add_executable(filelight ${filelight_SRCS})
 
 target_link_libraries(filelight ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
 

filelight/src/part/CMakeLists.txt

@@ -29,9 +29,9 @@ set(filelight_PART_SRCS
     fileTree.cpp
     localLister.cpp
     remoteLister.cpp
-    summaryWidget.cpp)
+    summaryWidget.cpp
-
+    dialog.ui
-kde4_add_ui_files(filelight_PART_SRCS dialog.ui)
+)
 
 kde4_add_plugin(filelightpart ${filelight_PART_SRCS})
 
@@ -41,7 +41,7 @@ target_link_libraries(filelightpart radialmap
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_KFILE_LIBS}
-                      ${KDE4_SOLID_LIBS})
+    ${KDE4_SOLID_LIBS}
-
+)
 
 install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR})

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)
 

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)

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,10 +33,16 @@ set(gwenview_SRCS
     startmainpage.cpp
     thumbnailviewhelper.cpp
     browsemainpage.cpp
-    )
+    advancedconfigpage.ui
+    fullscreenconfigwidget.ui
+    generalconfigpage.ui
+    imageviewconfigpage.ui
+    startmainpage.ui
+    browsemainpage.ui
+)
 
-if (KIPI_FOUND)
+if(KIPI_FOUND)
-    set (gwenview_SRCS
+    set(gwenview_SRCS
         ${gwenview_SRCS}
         kipiexportaction.cpp
         kipiimagecollectionselector.cpp
@@ -48,40 +51,25 @@ if (KIPI_FOUND)
     )
 endif()
 
-kde4_add_ui_files(gwenview_SRCS
+add_executable(gwenview ${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")
+target_link_libraries(gwenview
-
-kde4_add_executable(gwenview ${gwenview_SRCS})
-
-target_link_libraries(gwenview PRIVATE
     ${KDE4_KFILE_LIBS}
     gwenviewlib
     ${KDE4_KIO_LIBS}
     ${LIBKONQ_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    )
+    ${KDE4_KIO_LIBS}
+)
 
-target_link_libraries(gwenview PUBLIC ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY})
+if(KIPI_FOUND)
-
+    target_link_libraries(gwenview ${KIPI_LIBRARIES})
-if (KIPI_FOUND)
-    target_link_libraries(gwenview PRIVATE ${KIPI_LIBRARIES})
 endif()
 
-install(TARGETS gwenview
+install(TARGETS gwenview ${INSTALL_TARGETS_DEFAULT_ARGS})
-    ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES gwenviewui.rc
+install(FILES gwenviewui.rcm DESTINATION ${DATA_INSTALL_DIR}/gwenview)
-    DESTINATION ${DATA_INSTALL_DIR}/gwenview)
 
-install(PROGRAMS gwenview.desktop
+install(PROGRAMS gwenview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-    DESTINATION ${XDG_APPS_INSTALL_DIR})
+
-install(FILES slideshow.desktop
+install(FILES slideshow.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
-    DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)

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
+add_executable(gwenview_importer ${importer_SRCS})
-    importerconfig.kcfgc
-    )
-
-kde4_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 gwenview_importer ${INSTALL_TARGETS_DEFAULT_ARGS})
-    ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES gwenview_importer.desktop
     gwenview_importer_camera.desktop

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
+kde4_add_kcfg_files(gwenviewlib_SRCS gwenviewconfig.kcfgc)
-    crop/cropwidget.ui
-    documentview/messageview.ui
-    print/printoptionspage.ui
-    redeyereduction/redeyereductionwidget.ui
-    resize/resizeimagewidget.ui
-    )
 
-kde4_add_kcfg_files(gwenviewlib_SRCS
+add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
-    gwenviewconfig.kcfgc
-    )
-
-kde4_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})

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}

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 )
-
+endif()
-target_link_libraries(testfilter  ${KDE4_KDEUI_LIBS} kttsd )
-
 
 ########### install files ###############
 

jovie/filters/stringreplacer/CMakeLists.txt

@@ -7,30 +7,31 @@ set(jovie_stringreplacerplugin_PART_SRCS
     stringreplacerconf.cpp 
     stringreplacerproc.cpp
     stringreplacerplugin.cpp 
-    cdataescaper.cpp)
+    cdataescaper.cpp
-
+    stringreplacerconfwidget.ui
-kde4_add_ui_files(jovie_stringreplacerplugin_PART_SRCS stringreplacerconfwidget.ui editreplacementwidget.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)
+if(ENABLE_TESTING)
-kde4_add_unit_test(
+    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
+    target_link_libraries(test_cdataescaper
         ${KDE4_KDECORE_LIBS}
         ${QT_QTTEST_LIBRARY}
         ${QT_QTCORE_LIBRARY}
-)
+    )
+endif()
 
 ########### install files ###############
 

jovie/filters/talkerchooser/CMakeLists.txt

@@ -6,15 +6,13 @@ set(jovie_talkerchooserplugin_PART_SRCS
     selecttalkerdlg.cpp
     talkerchooserconf.cpp 
     talkerchooserproc.cpp 
-    talkerchooserplugin.cpp )
+    talkerchooserplugin.cpp
-
+    talkerchooserconfwidget.ui
-
+    selecttalkerwidget.ui
-kde4_add_ui_files(jovie_talkerchooserplugin_PART_SRCS 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} )

jovie/filters/xmltransformer/CMakeLists.txt

@@ -2,14 +2,15 @@
 
 ########### next target ###############
 
-set(jovie_xmltransformerplugin_PART_SRCS xmltransformerconf.cpp xmltransformerproc.cpp xmltransformerplugin.cpp )
+set(jovie_xmltransformerplugin_PART_SRCS
-
+    xmltransformerconf.cpp
-kde4_add_ui_files(jovie_xmltransformerplugin_PART_SRCS xmltransformerconfwidget.ui )
+    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} )

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)
 

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} )

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}

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 )
+   stats.cpp
-
-kde4_add_ui_files(kcalc_SRCS
    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")
+add_executable( kcalc ${kcalc_SRCS})
-
-kde4_add_executable( kcalc ${kcalc_SRCS})
 
 target_link_libraries(kcalc ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})
 

kcalc/ChangeLog

@@ -1,381 +0,0 @@
-2005-04-30 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Fix BUG 100316
-
-2005-04-25 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-        * Fix BUG 99817.
-
-2005-04-20 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Change C-style casts for C++ casts, removed some C-style typedefs
-
-2005-04-02 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* GUI: added statusflags to display, looks very neat (this was
-	  contributed by Bernd Brandstetter; well done!)
-
-2005-03-30 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* added a Memory-Store button (contributed by Bernd Brandstetter)
-
-2005-03-29 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* fix M+/- button to change when inverse is pressed
-
-2005-03-08 Evan Teran <eteran@alum.rit.edu>
-	* updated about box to reflect my correct email address. This one is 
-	permanent and will never change again
-	  
-2005-02-05 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* added some more contants and dropped Pi-button since not needed.
-	  Instead new cube and cube root button.
-
-2004-12-17 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* almost finished feature which allows to choose from list
-	  of scientific constants
-
-2004-12-17 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-        * started implementation of a list of scientific constants
-
-2004-12-06 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* further refactoring of configuration options for const buttons
-
-2004-12-05 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* understood how kconfigxt handles indexed configuration options
-
-2004-12-03 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* moving through history is now done via undo/redo
-	  this implements wish BUG 93938
-	
-2004-11-23 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* improved const buttons
-
-2004-10-20 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* clean up Const-Buttons. More work still required.
-
-2004-10-16 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* improve Const-Buttons: set value by using INV-Button instead of config-menu
-
-2004-09-24 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-        * fixed BUG 90009: the display does not resize in vertical direction anymore
-
-2004-09-24 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-        * fixed small bug: switching off Logic-mode tried to change item in statusbar,
-          but item did not exist.
-
-2004-09-11 Klaus Niederkrüger <kniederk@math.uni-koeln.de> *
-	* fix bug 82433: show a check mark next to the angle mode in popup menu
-	
-2004-09-10 Klaus Niederkrüger <kniederk@math.uni-koeln.de> *
-	* bundle precedence of operators and function pointers into a single
-	  struct.
-	
-2004-09-08 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* moved angle mode logic into GUI
-
-2004-09-04 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* reduced the number of entry points into the CalcEngine
-	  Aim: enterOperation the only entry point
-
-2004-08-2? Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* added some labels and tooltips for inverse mode
-
-2004-08-2? Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* fix to BUG 74657
-	* fix to BUG 78726
-
-2004-07-30 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Square root button did not work correctly after pressing CTRL (Bug 86004)
-
-2004-07-30 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Added Accels for Const-Buttons
-
-2004-07-29 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Fixed BUG 67984 (thanks to André Wöbbeking)
-	
-2004-07-17 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Fixed BUG 85357
-	
-2004-06-05 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* Masked "&" for the label of the AND button, when displaying the corresponding accel.
-	  Thanks to Sigrid from Trolltech.
-	
-2004-04-27 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* Pasted numbers in Hex-Mode are now always interpreted as
-	  hex-numbers (BUG 65167).
-
-2004-03-26 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Centered labels on buttons
-	
-2004-03-24 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Press (and hold) CTRL-key to see accels for all
-	buttons (BUG 69850).
-	
-2004-03-19 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* Moved functions that paint e.g. "x^y" to the KCalcButton-class.
-	
-2004-03-01 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* Changed many accels from "accel()->insert()" to
-	  "button->addAccel()". Fixes BUG 75555.
-	* deactivate EE-button, when Base != DEC  
-	
-2004-02-10 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* Fixed bug 73437. Pasting empty clipboard made kcalc crash.
-
-2004-02-04 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Moved more accels from keyPressEvent into accels
-	
-2004-01-27 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-        * Fix paste-function: Pasting e.g. "123  \n" did not work
-          because of the trailing spaces and returns.
-
-2004-01-25 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Applied patch from Thomas Weber: Creates buttons C1-C6
-	  to store constants
-
-2003-12-06 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Fix problem with several identical labels in statusbar
-	  with the help of newly added statusbar->hasItem.
-
-2003-12-06 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* More reorganization and preparation for getting accels right.
-
-2003-10-31 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Split Constructor into more subfunctions.
-	  To be continued.
-	
-2003-10-20 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* RadioButtons for Base and Angle converted to PopUpMenu+Button
-	* Layout changed
-	* Moved ENTER form keyPressedEvent to Accel()
-
-2003-10-10 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Number buttons look like numeric keyboard (on US-keyboards that is)
-	* Initialize ToggleActions correctly
-	
-2003-10-09 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Reverted the menubar stuff after several complaints.
-	  Now Kcalc-GUI looks again like on 2003-09-11.
-	
-2003-09-30 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* Fixed bug (unitialized pointers)
-	
-2003-09-26 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* deleted a few #includes
-	
-2003-09-02 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* 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 <kniederk@math.uni-koeln.de>
-	* finished the separation of gui-code from the calculating core.
-	  this still needs some clean-up
-	
-2003-02-11 Evan Teran <emt3734@rit.edu>
-	* 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 <emt3734@rit.edu>
-	* 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 <emt3734@rit.edu>
-	* 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 <emt3734@rit.edu>
-	* 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 <emt3734@rit.edu>
-	* 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  <wuebben@math.cornell.edu>
-
-	* 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 <mweilguni@kde.org>
-
-	* 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 <mweilguni@kde.org>
-
-	* 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  <wuebben@math.cornell.edu>
-
-	* Added the comma key as an accelerator for '.'
-
-Sat Apr 18 16:26:52 1998  Bernd Johannes Wuebben  <wuebben@math.cornell.edu>
-
-	* Some inverse functions didn't compute right. Wonder who broke them.
-
-Sun Feb  8 16:11:34 1998  Bernd Johannes Wuebben  <wuebben@math.cornell.edu>
-
-	* removed a compiler warning
-
-Sat Nov 22 14:30:37 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
-
-	* 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  <wuebben@petit.cornell.edu>
-
-	* kcalc.cpp: Added statistical functions
-
-Mon Sep 15 00:34:58 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
-
-	* 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  <wuebben@petit.cornell.edu>
-
-	* kcalc.h: clean up
-	
-

kcalc/knumber/CMakeLists.txt

@@ -1,2 +1,3 @@
-
+if(ENABLE_TESTING)
-add_subdirectory( tests ) 
+    add_subdirectory( tests )
+endif()

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")
+add_executable(kcharselect ${kcharselect_SRCS})
-
-kde4_add_executable(kcharselect ${kcharselect_SRCS})
 
 target_link_libraries(kcharselect  ${KDE4_KDEUI_LIBS} )
 

kcolorchooser/CMakeLists.txt

@@ -1,19 +1,17 @@
 project(kcolorchooser)
 
-# search packages used by KDE
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-find_package(KDE4 4.14.3 REQUIRED)
+    find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
+    include(KDE4Defaults)
-include(MacroLibrary)
+    include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
+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")
+add_executable(kcolorchooser ${kcolorchooser_SRCS})
-
-kde4_add_executable(kcolorchooser ${kcolorchooser_SRCS})
 
 target_link_libraries(kcolorchooser ${KDE4_KDEUI_LIBS})
 

kdenetwork-filesharing/samba/filepropertiesplugin/CMakeLists.txt

@@ -1,9 +1,11 @@
 ########### next target ###############
 
-set(sambausershareplugin_PART_SRCS sambausershareplugin.cpp delegate.cpp model.cpp)
+set(sambausershareplugin_PART_SRCS
-
+    sambausershareplugin.cpp
-kde4_add_ui_files(sambausershareplugin_PART_SRCS sambausershareplugin.ui)
+    delegate.cpp
-
+    model.cpp
+    sambausershareplugin.ui
+)
 
 kde4_add_plugin(sambausershareplugin ${sambausershareplugin_PART_SRCS})
 

kdeplasma-addons/applets/bball/CMakeLists.txt

@@ -1,8 +1,6 @@
 project(bball)
 
-set(bball_SRCS bball.cpp)
+set(bball_SRCS bball.cpp bballConfig.ui)
-
-kde4_add_ui_files(bball_SRCS bballConfig.ui)
 
 kde4_add_plugin(plasma_applet_bball ${bball_SRCS})
 

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})

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})
 

kdeplasma-addons/applets/comic/CMakeLists.txt

@@ -12,9 +12,6 @@ set(comic_SRCS
     comicsaver.cpp
     stripselector.cpp
     activecomicmodel.cpp
-)
-
-kde4_add_ui_files(comic_SRCS
     comicSettings.ui
     appearanceSettings.ui
     advancedsettings.ui

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 )
+set(fifteenPuzzle_SRCS src/fifteenPuzzle.cpp src/fifteen.cpp src/piece.cpp src/fifteenPuzzleConfig.ui )
-
-kde4_add_ui_files(fifteenPuzzle_SRCS src/fifteenPuzzleConfig.ui )
 kde4_add_plugin(plasma_applet_fifteenPuzzle ${fifteenPuzzle_SRCS})
 
 target_link_libraries(plasma_applet_fifteenPuzzle ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})

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})

kdeplasma-addons/applets/frame/CMakeLists.txt

@@ -9,15 +9,15 @@ set(frame_SRCS
     picture.cpp
     imagescaler.cpp
     imageloader.cpp
-    configdialog.cpp)
+    configdialog.cpp
-
+    imageSettings.ui
-kde4_add_ui_files(frame_SRCS imageSettings.ui appearanceSettings.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

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})
 

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
+    windowtaskitem.cpp
-    jobmanager.cpp dockmanager.cpp dockitem.cpp dockhelper.cpp dockconfig.cpp mediabuttons.cpp unity.cpp unityitem.cpp 
+    tasks.cpp
-    dbusstatus.cpp recentdocuments.cpp
+    taskitemlayout.cpp
-    tooltips/tooltipcontent.cpp tooltips/tooltip.cpp tooltips/tooltipmanager.cpp tooltips/windowpreview.cpp
+    abstracttaskitem.cpp
-    tooltips/dialogshadows.cpp tooltips/dialogshadows_p.h
+    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})

kdeplasma-addons/applets/incomingmsg/CMakeLists.txt

@@ -2,10 +2,7 @@
 project(plasma-incomingmsg)
 
 # We add our source code here
-set(incomingmsg_SRCS incomingmsg.cpp)
+set(incomingmsg_SRCS incomingmsg.cpp widget.ui)
-
-# Now make sure all files get to the right place
-kde4_add_ui_files(incomingmsg_SRCS widget.ui)
 kde4_add_plugin(plasma_applet_incomingmsg ${incomingmsg_SRCS})
 
 target_link_libraries(plasma_applet_incomingmsg

kdeplasma-addons/applets/incomingmsg/ChangeLog

@@ -1,4 +0,0 @@
-v 0.01 
-* First usable release.
-v 0.02
-* Added qutIM support

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

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(
+add_executable(lancelot-menu ${plasma_lancelot_SRCS})
-   plasma_lancelot_SRCS
-   ui/LancelotConfigBase.ui
-)
-
-kde4_add_executable(lancelot-menu ${plasma_lancelot_SRCS})
 
 target_link_libraries(
    lancelot-menu

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
-)
+   ../application/LancelotConfigBase.ui
-
-kde4_add_ui_files(
-   plasma_applet_lancelot_launcher_SRCS
-   ../application/ui/LancelotConfigBase.ui
 )
 
 kde4_add_plugin(plasma_applet_lancelot_launcher ${plasma_applet_lancelot_launcher_SRCS})

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
 )
 

kdeplasma-addons/applets/leavenote/CMakeLists.txt

@@ -2,10 +2,7 @@
 project(plasma-leavenote)
 
 # We add our source code here
-set(leavenote_SRCS leavenote.cpp)
+set(leavenote_SRCS leavenote.cpp widget.ui)
-
-# Now make sure all files get to the right place
-kde4_add_ui_files(leavenote_SRCS widget.ui)
 kde4_add_plugin(plasma_applet_leavenote ${leavenote_SRCS})
 
 target_link_libraries(plasma_applet_leavenote

kdeplasma-addons/applets/leavenote/ChangeLog

@@ -1,2 +0,0 @@
-v 0.01 
-* First usable release.

kdeplasma-addons/applets/life/CMakeLists.txt

@@ -1,8 +1,6 @@
 project(life)
 
-set(life_SRCS life.cpp)
+set(life_SRCS life.cpp lifeConfig.ui)
-
-kde4_add_ui_files(life_SRCS lifeConfig.ui)
 kde4_add_plugin(plasma_applet_life ${life_SRCS})
 target_link_libraries(plasma_applet_life
                       ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})

kdeplasma-addons/applets/luna/CMakeLists.txt

@@ -1,8 +1,6 @@
 project(luna)
 
-set(luna_SRCS luna.cpp)
+set(luna_SRCS luna.cpp lunaConfig.ui)
-
-kde4_add_ui_files(luna_SRCS lunaConfig.ui)
 kde4_add_plugin(plasma_applet_luna ${luna_SRCS})
 target_link_libraries(plasma_applet_luna
                       ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})

kdeplasma-addons/applets/microblog/CMakeLists.txt

@@ -3,8 +3,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} )
 
 set(microblog_SRCS
     microblog.cpp
-    postwidget.cpp)
+    postwidget.cpp
-kde4_add_ui_files(microblog_SRCS configuration.ui)
+    configuration.ui
+)
 
 kde4_add_plugin(plasma_applet_microblog ${microblog_SRCS})
 target_link_libraries(plasma_applet_microblog ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})

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})

kdeplasma-addons/applets/notes/CMakeLists.txt

@@ -7,8 +7,7 @@ include_directories(
     ${KDE4_INCLUDES}
     )
 
-set(notes_SRCS notes.cpp textedit.cpp)
+set(notes_SRCS notes.cpp textedit.cpp config.ui)
-kde4_add_ui_files(notes_SRCS config.ui)
 
 kde4_add_plugin(plasma_applet_notes ${notes_SRCS})
 target_link_libraries(plasma_applet_notes

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

kdeplasma-addons/applets/pastebin/CMakeLists.txt

@@ -1,9 +1,9 @@
 project(plasma-pastebin)
 
 set(pastebin_SRCS
-  pastebin.cpp)
+    pastebin.cpp
-
+    pastebinConfig.ui
-kde4_add_ui_files(pastebin_SRCS 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})

kdeplasma-addons/applets/plasmaboard/CMakeLists.txt

@@ -13,11 +13,28 @@ include_directories(
    )
 
 # We add our source code here
-set(plasmaboard_SRCS widget.cpp BoardKey.cpp PanelIcon.cpp AlphaNumKey.cpp
+set(plasmaboard_SRCS
-    DualKey.cpp FuncKey.cpp EnterKey.cpp BackspaceKey.cpp TabKey.cpp
+    widget.cpp
-    ShiftKey.cpp CapsKey.cpp ArrowTopKey.cpp ArrowBottomKey.cpp
+    BoardKey.cpp
-    ArrowLeftKey.cpp ArrowRightKey.cpp tooltip.cpp StickyKey.cpp
+    PanelIcon.cpp
-    SwitchKey.cpp Layout.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)
@@ -25,8 +42,6 @@ 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 

kdeplasma-addons/applets/rememberthemilk/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${KDE4_INCLUDES}
-   )
+)
 
 set(rememberthemilk-plasmoid_SRCS 
     rememberthemilk-plasmoid.cpp
@@ -12,9 +12,10 @@ set(rememberthemilk-plasmoid_SRCS
     taskitemdelegate.cpp
     taskeditor.cpp
     taskmodel.cpp
-      tasksortfilter.cpp)
+    tasksortfilter.cpp
-      
+    authenticate.ui
-kde4_add_ui_files(rememberthemilk-plasmoid_SRCS authenticate.ui general.ui)
+    general.ui
+)
 
 kde4_add_plugin(plasma_applet_rtm ${rememberthemilk-plasmoid_SRCS})
 target_link_libraries(plasma_applet_rtm 
@@ -22,7 +23,7 @@ target_link_libraries(plasma_applet_rtm
     ${KDE4_SOLID_LIBS}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KDEWEBKIT_LIBS}
-                     )
+)
  
 install(TARGETS plasma_applet_rtm
         DESTINATION ${PLUGIN_INSTALL_DIR})

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
+    arrows.svgz
-rssnow.svgz
+    rssnow.svgz
-background.svgz
+    background.svgz
-DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/rssnow/)
+    DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/rssnow/)

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)
+    systemloadviewer.cpp
+    generalconfig.ui
+    coloursconfig.ui
+)
 
-#find_package(KDE4 4.14.3 REQUIRED)
-
-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})

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)
+set(timer_SRCS
-kde4_add_ui_files(timer_SRCS timerConfig.ui predefinedTimersConfig.ui)
+    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})

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
 )
 

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}

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})
+    ${QT_QTWEBKIT_LIBRARY}
+)
 
 install(TARGETS plasma_applet_webslice DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-webslice.desktop DESTINATION ${SERVICES_INSTALL_DIR})

kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt

@@ -20,11 +20,10 @@ set(groupingcontainment_SRCS
     groupexplorer/groupexplorer.cpp
     groupexplorer/groupiconlist.cpp
     groupexplorer/groupicon.cpp
+
+    groups/tabbinggroup_config.ui
 )
-
+add_library(plasma_groupingcontainment SHARED ${groupingcontainment_SRCS})
-
-kde4_add_ui_files(groupingcontainment_SRCS groups/tabbinggroup_config.ui)
-kde4_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})

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(