generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e04ac1b..a501daf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,7 @@ project(kde-extraapps)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 
-set(QT_MIN_VERSION "4.8.2")
-find_package(KDE4 4.14.3 REQUIRED)
+find_package(KDE4 4.18.0 REQUIRED)
 include(KDE4Defaults)
 include(GenerateExportHeader)
 

diff --git a/about-distro/CMakeLists.txt b/about-distro/CMakeLists.txt
index 51881cc..a943b01 100644 (file)
--- a/about-distro/CMakeLists.txt
+++ b/about-distro/CMakeLists.txt
@@ -1,5 +1,12 @@
 project(kcm-about-distro)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 set(MAJOR_VERSION "1")
 set(MINOR_VERSION "1")
 set(PATCH_VERSION "0")

diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt
index 755d257..3fb6a51 100644 (file)
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@ -1,10 +1,14 @@
 project(akregator)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${KDE4_INCLUDES}
 )
 
 include(CheckTypeSize)

diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index 8366f19..9a39c7e 100644 (file)
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -1,21 +1,10 @@
 project(ark)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 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} )
 endif()
 
 include( MacroLibrary )

diff --git a/bluedevil/CMakeLists.txt b/bluedevil/CMakeLists.txt
index 65d9eae..fa67881 100644 (file)
--- a/bluedevil/CMakeLists.txt
+++ b/bluedevil/CMakeLists.txt
@@ -1,17 +1,23 @@
 project(bluedevil)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 set(CMAKE_BLUEDEVIL_VERSION_MAJOR 2)
 set(CMAKE_BLUEDEVIL_VERSION_MINOR 1)
 set(CMAKE_BLUEDEVIL_VERSION_PATCH 1)
 set(CMAKE_BLUEDEVIL_VERSION_STRING  "${CMAKE_BLUEDEVIL_VERSION_MAJOR}.${CMAKE_BLUEDEVIL_VERSION_MINOR}.${CMAKE_BLUEDEVIL_VERSION_PATCH}")
-configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
-include(MacroOptionalAddSubdirectory)
+configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 find_package(SharedMimeInfo REQUIRED)
 
-include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} libbluedevil)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} libbluedevil)
 
 add_subdirectory(src)
 
-add_subdirectory( libbluedevil )
+add_subdirectory(libbluedevil)

diff --git a/ffmpegthumbs/CMakeLists.txt b/ffmpegthumbs/CMakeLists.txt
index 4dee492..0e7dd65 100644 (file)
--- a/ffmpegthumbs/CMakeLists.txt
+++ b/ffmpegthumbs/CMakeLists.txt
@@ -1,19 +1,15 @@
 project(ffmpegthumbs)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
+    find_package(KDE4 4.18.0 REQUIRED)
     include(KDE4Defaults)
     include_directories(${KDE4_INCLUDES})
-
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 endif()
 
 find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
 
 include_directories(
-    ${KDE4_INCLUDES}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${PC_AVCODEC_INCLUDEDIR}
     ${PC_AVFORMAT_INCLUDEDIR}
     ${FFMPEG_INCLUDE_DIR}

diff --git a/filelight/CMakeLists.txt b/filelight/CMakeLists.txt
index 027d054..3fc9c46 100644 (file)
--- a/filelight/CMakeLists.txt
+++ b/filelight/CMakeLists.txt
@@ -21,18 +21,15 @@
 project(Filelight)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
     include_directories(${KDE4_INCLUDES})
-
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 endif()
 
-add_definitions( -DQT_NO_CAST_FROM_ASCII )
-add_definitions( -DQT_NO_CAST_TO_ASCII )
+add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
 
-include_directories(src/)
+include_directories(src)
 
 add_subdirectory(src)
 add_subdirectory(misc)

diff --git a/gwenview/CMakeLists.txt b/gwenview/CMakeLists.txt
index 77a4578..476861f 100644 (file)
--- a/gwenview/CMakeLists.txt
+++ b/gwenview/CMakeLists.txt
@@ -1,5 +1,12 @@
 project(gwenview)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 ## Dependencies
 find_package(JPEG)
 macro_log_feature(JPEG_FOUND "libjpeg" "JPEG image manipulation support" "http://libjpeg.sourceforge.net/" TRUE)
@@ -21,21 +28,11 @@ macro_log_feature(LIBKONQ_FOUND "libkonq" "Standard file management features" "h
 
 ## Global settings
 
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-add_definitions(
-    ${QT_DEFINITIONS}
-    ${QT_QTDBUS_DEFINITIONS}
-    ${KDE4_DEFINITIONS}
-    )
-
 include_directories(
     ${QDBUS_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
-    ${KDE4_INCLUDES}
     ${EXIV2_INCLUDE_DIR}
     ${KDCRAW_INCLUDE_DIR}
-    )
+)
 
 ## dirs to build
 add_subdirectory(lib)

diff --git a/jovie/CMakeLists.txt b/jovie/CMakeLists.txt
index 0e59060..e79287c 100644 (file)
--- a/jovie/CMakeLists.txt
+++ b/jovie/CMakeLists.txt
@@ -1,14 +1,22 @@
 project(kttsd)
 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-add_definitions( -DQT_NO_CAST_FROM_ASCII )
-add_definitions( -DQT_NO_CAST_TO_ASCII )
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
 
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
+add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
+
+include_directories(${CMAKE_SOURCE_DIR})
 
 macro_optional_find_package(Speechd)
-macro_log_feature(SPEECHD_FOUND "speechd" "Speech Dispatcher provides a high-level device independent layer for speech synthesis" "http://www.freebsoft.org/speechd" FALSE "" "Jovie requires speech dispatcher.")
+set_package_properties(Speechd PROPERTIES
+    URL "http://www.freebsoft.org/speechd"
+    DESCRIPTION "Speech Dispatcher provides a high-level device independent layer for speech synthesis"
+    PURPOSE "Jovie requires speech dispatcher."
+)
 
 if (SPEECHD_FOUND)
     if(NOT Q_WS_X11)

diff --git a/kcharselect/CMakeLists.txt b/kcharselect/CMakeLists.txt
index 0914503..69f6794 100644 (file)
--- a/kcharselect/CMakeLists.txt
+++ b/kcharselect/CMakeLists.txt
@@ -1,23 +1,14 @@
 project(kcharselect)
 
-########### next target ###############
-
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 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} )
 endif()
 
+########### next target ###############
+
 set(kcharselect_SRCS kcharselectdia.cc main.cc )
 
 add_executable(kcharselect ${kcharselect_SRCS})

diff --git a/kcolorchooser/CMakeLists.txt b/kcolorchooser/CMakeLists.txt
index 140b7ba..0bf0521 100644 (file)
--- a/kcolorchooser/CMakeLists.txt
+++ b/kcolorchooser/CMakeLists.txt
@@ -1,9 +1,10 @@
 project(kcolorchooser)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
+    find_package(KDE4 4.18.0 REQUIRED)
     include(KDE4Defaults)
-    include(MacroLibrary)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})

diff --git a/kdeplasma-addons/CMakeLists.txt b/kdeplasma-addons/CMakeLists.txt
index a25bbdd..8871d02 100644 (file)
--- a/kdeplasma-addons/CMakeLists.txt
+++ b/kdeplasma-addons/CMakeLists.txt
@@ -1,16 +1,14 @@
 project(kdeplasma-addons)
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
     include_directories(${KDE4_INCLUDES})
-
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 endif()
 
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
 macro_optional_find_package(KDE4Workspace)
 macro_log_feature(KDE4WORKSPACE_FOUND "kdebase workspace" "KDE base workspace libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma plugins")
 

diff --git a/kdeplasma-addons/applets/kdeobservatory/CMakeLists.txt b/kdeplasma-addons/applets/kdeobservatory/CMakeLists.txt
index 4c8b536..b3ce701 100644 (file)
--- a/kdeplasma-addons/applets/kdeobservatory/CMakeLists.txt
+++ b/kdeplasma-addons/applets/kdeobservatory/CMakeLists.txt
@@ -1,8 +1,14 @@
 project(plasma-kdeobservatory)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
- 
-find_package(KDE4 4.14.3 REQUIRED)
+
 find_package(Qwt REQUIRED)
 
 include(KDE4Defaults)

diff --git a/kdeplasma-addons/applets/lancelot/CMakeLists.txt b/kdeplasma-addons/applets/lancelot/CMakeLists.txt
index e09a67f..2b99fb0 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/CMakeLists.txt
+++ b/kdeplasma-addons/applets/lancelot/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(KDE4 4.14.3 REQUIRED)
-
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 SET(CMAKE_CXX_FLAGS_CODECHECK "${CMAKE_CXX_FLAGS} -save-temps")

diff --git a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt
index e98c920..1043203 100644 (file)
--- a/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt
+++ b/kdeplasma-addons/applets/plasmaboard/CMakeLists.txt
@@ -1,17 +1,6 @@
 # Project Needs a name ofcourse
 project(plasmaboard)
 
-# Find the required Libaries
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-        
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories(
-   ${CMAKE_SOURCE_DIR}
-   ${CMAKE_BINARY_DIR}
-   ${KDE4_INCLUDES}
-   )
-
 # We add our source code here
 set(plasmaboard_SRCS
     widget.cpp

diff --git a/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt b/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt
index 3b5f8e5..29422c0 100644 (file)
--- a/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/kdecommits/CMakeLists.txt
@@ -1,16 +1,5 @@
 project(plasma-kdecommitsengine)
- 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
- 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
-include_directories(
-   ${CMAKE_SOURCE_DIR}
-   ${CMAKE_BINARY_DIR}
-   ${KDE4_INCLUDES}
-   )
- 
 set(kdecommits_engine_SRCS
     src/kdepresets.cpp
     src/kdecommitsengine.cpp

diff --git a/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt b/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt
index c710109..b96b4f1 100644 (file)
--- a/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/kdeobservatory/CMakeLists.txt
@@ -1,15 +1,9 @@
 project(plasma-kdeobservatoryengine)
- 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
- 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
-   ${KDE4_INCLUDES}
-   )
+)
  
 set(kdeobservatory_engine_SRCS
     src/kdepresets.cpp

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt
index 36e5610..418a712 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt
+++ b/kdeplasma-addons/libs/lancelot-datamodels/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(liblancelot-datamodels)
 
-find_package(KDE4 4.14.3 REQUIRED)
-
-include (KDE4Defaults)
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
 find_package(Lancelot REQUIRED)
 
 set (ADDITIONAL_LINK_LIBRARIES)

diff --git a/kfilemetadata/CMakeLists.txt b/kfilemetadata/CMakeLists.txt
index e4d6c50..1ba09bb 100644 (file)
--- a/kfilemetadata/CMakeLists.txt
+++ b/kfilemetadata/CMakeLists.txt
@@ -1,5 +1,12 @@
 project(kfilemetadata)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 find_package(PopplerQt4 0.12.1)
 set_package_properties(PopplerQt4 PROPERTIES DESCRIPTION "A PDF rendering library"
                        URL "http://poppler.freedesktop.org" TYPE OPTIONAL

diff --git a/kfloppy/CMakeLists.txt b/kfloppy/CMakeLists.txt
index cb7b3f7..90e6be1 100644 (file)
--- a/kfloppy/CMakeLists.txt
+++ b/kfloppy/CMakeLists.txt
@@ -1,25 +1,16 @@
 project(kfloppy)
 
-if(NOT UNIX)
-  message(FATAL_ERROR "KFloppy is only supposed to be built on Unix platforms.")
-endif(NOT UNIX)
-
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
+    find_package(KDE4 4.18.0 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} )
 endif()
 
+if(NOT UNIX)
+  message(FATAL_ERROR "KFloppy is only supposed to be built on Unix platforms.")
+endif(NOT UNIX)
+
 set(kfloppy_SRCS main.cpp format.cpp floppy.cpp )
 
 add_executable(kfloppy ${kfloppy_SRCS})

diff --git a/kget/plasma/runner/kgetrunner.cpp b/kget/plasma/runner/kgetrunner.cpp
index eb760ab..62690f3 100644 (file)
--- a/kget/plasma/runner/kgetrunner.cpp
+++ b/kget/plasma/runner/kgetrunner.cpp
@@ -78,7 +78,7 @@ void KGetRunner::run(const Plasma::RunnerContext& /*context*/, const Plasma::Que
     if(connection->lastError().type() != QDBusError::NoError) {
         KNotification::event(KNotification::Error,
                 i18n("<p>KGet Runner could not communicate with KGet.</p><p style=\"font-size: small;\">Response from DBus:<br/>%1</p>", connection->lastError().message()),
-                KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
+                KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistent*/);
         return;
     }
     
@@ -106,7 +106,7 @@ void KGetRunner::callFinished(QDBusPendingCallWatcher* call)
         //  Send a notification about the error to the user.
         KNotification::event(KNotification::Error,
                 i18n("<p>KGet Runner could not communicate with KGet.</p><p style=\"font-size: small;\">Response from DBus:<br/>%1</p>", reply.error().message()),
-                KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
+                KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistent*/);
     }
 }
 

diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt
index 8620838..b4254f6 100644 (file)
--- a/kgpg/CMakeLists.txt
+++ b/kgpg/CMakeLists.txt
@@ -1,18 +1,10 @@
 project(kgpg)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
-
+    find_package(KDE4 4.18.0 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} )
 endif()
 
 # only headers are used

diff --git a/kolourpaint/CMakeLists.txt b/kolourpaint/CMakeLists.txt
index f09ad66..d4b61c4 100644 (file)
--- a/kolourpaint/CMakeLists.txt
+++ b/kolourpaint/CMakeLists.txt
@@ -1,7 +1,13 @@
 project(kolourpaint)
 
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 find_package(QImageBlitz)
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/commands

diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt
index c7146fc..d20cced 100644 (file)
--- a/ktimer/CMakeLists.txt
+++ b/ktimer/CMakeLists.txt
@@ -1,19 +1,10 @@
 project(ktimer)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 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} )
 endif()
 
 set(ktimer_SRCS main.cpp ktimer.cpp prefwidget.ui )

diff --git a/kuassel/CMakeLists.txt b/kuassel/CMakeLists.txt
index 828615f..d67c993 100644 (file)
--- a/kuassel/CMakeLists.txt
+++ b/kuassel/CMakeLists.txt
@@ -9,19 +9,10 @@
 project(KuasselIRC)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.14.3 REQUIRED)
-    include( KDE4Defaults )
+    find_package(KDE4 4.18.0 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} )
 endif()
 
 # Version

diff --git a/libktorrent/CMakeLists.txt b/libktorrent/CMakeLists.txt
index 704efac..f481f9f 100644 (file)
--- a/libktorrent/CMakeLists.txt
+++ b/libktorrent/CMakeLists.txt
@@ -1,18 +1,16 @@
 project(LIBKTORRENT)
 
-find_package(KDE4 4.14.3 REQUIRED)
-find_package(KDE4Internal REQUIRED)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
 find_package(GMP REQUIRED)
 find_package(QCA2 REQUIRED)
-
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules;${CMAKE_MODULE_PATH}")
 find_package(LibGcrypt REQUIRED)
 
-# set some default settings
-include(KDE4Defaults)
-enable_testing()
-set(BUILD_TESTING ON)
-
 # make some more macros available
 include (MacroLibrary)
 

diff --git a/thumbnailers/CMakeLists.txt b/thumbnailers/CMakeLists.txt
index 3db15bd..b578b1e 100644 (file)
--- a/thumbnailers/CMakeLists.txt
+++ b/thumbnailers/CMakeLists.txt
@@ -1,12 +1,11 @@
 project(kdegraphics-thumbnailers)
 
-add_definitions(
-    ${QT_DEFINITIONS}
-    ${KDE4_DEFINITIONS}
-    -DQT_USE_FAST_CONCATENATIO
-    -DQT_USE_FAST_OPERATOR_PLUS
-)
-include_directories(${KDE4_INCLUDES})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    find_package(KDE4 4.18.0 REQUIRED)
+    include(KDE4Defaults)
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
 
 macro_optional_find_package(GettextPO)