From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 26 Sep 2015 03:10:52 +0000 (+0000)
Subject: generic: misc cleanups
X-Git-Tag: 4.22.0~1645
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=67bf56db3e7809316152c995d4e23021871304c8;p=kde%2Fkde-workspace.git

generic: misc cleanups
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d667829..8d20d936 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,4 @@
 project(KDEBASE_WORKSPACE)
-# set_package_properties appeared in cmake 2.8.6
-# TODO: Remove when kdelibs >= 4.10 will be required
-cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
 
 include(CTest)
 include(CTestConfig.cmake)
@@ -11,9 +8,6 @@ include(CheckFunctionExists)
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
 
-#search packages used by KDE
-set(QT_MIN_VERSION "4.8.2")
-
 find_package(KDE4 4.14.3 REQUIRED)
 include(KDE4Defaults)
 
@@ -173,20 +167,20 @@ add_subdirectory(cmake)
 add_subdirectory(libs)
 
 
-macro_optional_add_subdirectory( systemsettings )
+macro_optional_add_subdirectory(systemsettings )
 
 # core apps
-macro_optional_add_subdirectory( kcheckpass )
-macro_optional_add_subdirectory( kwin )
-macro_optional_add_subdirectory( ksmserver )
+macro_optional_add_subdirectory(kcheckpass)
+macro_optional_add_subdirectory(kwin)
+macro_optional_add_subdirectory(ksmserver)
 
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
-macro_optional_add_subdirectory( ksplash )
+macro_optional_add_subdirectory(ksplash)
 
-macro_optional_add_subdirectory( powerdevil )
-macro_optional_add_subdirectory( qguiplatformplugin_kde )
-macro_optional_add_subdirectory( ksysguard )
+macro_optional_add_subdirectory(powerdevil)
+macro_optional_add_subdirectory(qguiplatformplugin_kde)
+macro_optional_add_subdirectory(ksysguard)
 
 macro_optional_add_subdirectory(kcontrol)
 macro_optional_add_subdirectory(klipper)
diff --git a/appmenu/CMakeLists.txt b/appmenu/CMakeLists.txt
index 1b597c43..7bba52ef 100644
--- a/appmenu/CMakeLists.txt
+++ b/appmenu/CMakeLists.txt
@@ -1,7 +1,4 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
-    )
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
 include_directories(${DBUSMENUQT_INCLUDE_DIR})
 
@@ -16,7 +13,7 @@ set(kded_appmenu_SRCS
     glowbar.cpp
     verticalmenu.cpp
     shadows.cpp
-    )
+)
 
 qt4_add_dbus_adaptor(kded_appmenu_SRCS com.canonical.AppMenu.Registrar.xml
     menuimporter.h MenuImporter menuimporteradaptor MenuImporterAdaptor)
@@ -26,12 +23,17 @@ qt4_add_dbus_adaptor(kded_appmenu_SRCS org.kde.kded.appmenu.xml
 
 kde4_add_plugin(kded_appmenu ${kded_appmenu_SRCS})
 
-target_link_libraries(kded_appmenu ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${DBUSMENUQT_LIBRARIES} ${KDE4_PLASMA_LIBS})
+target_link_libraries(kded_appmenu
+    ${KDE4_KIO_LIBS}
+    ${X11_LIBRARIES}
+    ${DBUSMENUQT_LIBRARIES}
+    ${KDE4_PLASMA_LIBS}
+)
 
 install(TARGETS kded_appmenu  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
 
-install( FILES appmenu.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kded )
-install( FILES com.canonical.AppMenu.Registrar.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
-install( FILES org.kde.kded.appmenu.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
+install(FILES appmenu.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
+install(FILES com.canonical.AppMenu.Registrar.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+install(FILES org.kde.kded.appmenu.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index c7339be4..4e54a5fd 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -18,11 +18,13 @@ set(libklipper_common_SRCS
 )
 
 macro_optional_find_package(Prison QUIET CONFIG)
-set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
-                       URL "http://projects.kde.org/prison"
-                       TYPE OPTIONAL
-                       PURPOSE "Needed to create mobile barcodes from clipboard data"
-                      )
+set_package_properties(Prison PROPERTIES
+    DESCRIPTION "Prison library"
+    URL "http://projects.kde.org/prison"
+    TYPE OPTIONAL
+    PURPOSE "Needed to create mobile barcodes from clipboard data"
+)
+
 if (PRISON_FOUND)
     add_definitions(-DHAVE_PRISON)
     include_directories(${PRISON_INCLUDE_DIR})
@@ -32,7 +34,6 @@ kde4_add_kcfg_files(libklipper_common_SRCS klippersettings.kcfgc)
 
 set(klipper_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp)
 
-
 add_executable(klipper ${klipper_SRCS})
 
 target_link_libraries(klipper ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${ZLIB_LIBRARY})
@@ -43,7 +44,7 @@ if (PRISON_FOUND)
   target_link_libraries(klipper ${PRISON_LIBRARIES})
 endif (PRISON_FOUND)
 
-install(TARGETS klipper         ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(PROGRAMS klipper.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(PROGRAMS klipper.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})