generic: build system cleanups

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

diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 068184c..1cf30fb 100644 (file)
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -1,9 +1,5 @@
 project(kmix)
 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-
 # Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt.
 #find_package(Phonon REQUIRED)
 

diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt
index 950d783..d0f7954 100644 (file)
--- a/kompare/CMakeLists.txt
+++ b/kompare/CMakeLists.txt
@@ -1,11 +1,5 @@
-cmake_minimum_required(VERSION 2.6)
 project(kompare)
 
-# search packages used by KDE
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
 add_subdirectory( libkomparediff2 )
 add_subdirectory( interfaces )
 add_subdirectory( libdialogpages )
@@ -13,32 +7,50 @@ add_subdirectory( komparenavtreepart )
 add_subdirectory( komparepart )
 add_subdirectory( pics )
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/komparepart
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages
-                     ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
-                     ${CMAKE_CURRENT_SOURCE_DIR}/komparenavtreepart
-                     ${CMAKE_CURRENT_SOURCE_DIR}/komparepart
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libkomparediff2)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/komparepart
+    ${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages
+    ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
+    ${CMAKE_CURRENT_SOURCE_DIR}/komparenavtreepart
+    ${CMAKE_CURRENT_SOURCE_DIR}/komparepart
+    ${CMAKE_CURRENT_SOURCE_DIR}/libkomparediff2
+)
 
 
 ########### next target ###############
 
 set(kompare_SRCS
-main.cpp
-kompare_shell.cpp
-kompareurldialog.cpp
+    main.cpp
+    kompare_shell.cpp
+    kompareurldialog.cpp
 )
 
 add_executable(kompare ${kompare_SRCS})
 
-target_link_libraries(kompare  kompareinterface komparediff2 komparedialogpages ${KDE4_KTEXTEDITOR_LIBS} )
+target_link_libraries(kompare
+    kompareinterface
+    komparediff2
+    komparedialogpages
+    ${KDE4_KTEXTEDITOR_LIBS}
+)
 
-install(TARGETS kompare  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kompare ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### install files ###############
 
-install( PROGRAMS kompare.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
-install( FILES kompareui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kompare )
-install( FILES komparenavigationpart.desktop kompareviewpart.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+install(
+    PROGRAMS kompare.desktop
+    DESTINATION  ${XDG_APPS_INSTALL_DIR}
+)
+install(
+    FILES kompareui.rc
+    DESTINATION  ${DATA_INSTALL_DIR}/kompare
+)
+install(
+    FILES
+    komparenavigationpart.desktop
+    kompareviewpart.desktop
+    DESTINATION  ${SERVICETYPES_INSTALL_DIR}
+)
 

diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt
index 60c1092..e0d69d4 100644 (file)
--- a/ksnapshot/CMakeLists.txt
+++ b/ksnapshot/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(ksnapshot)
 
-find_package(KDE4 4.14.3 REQUIRED)
-
-include(KDE4Defaults)
-include(MacroLibrary)
-
 macro_optional_find_package(Kipi)
 
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})

diff --git a/ksystemlog/CMakeLists.txt b/ksystemlog/CMakeLists.txt
index 6266981..fa8324f 100644 (file)
--- a/ksystemlog/CMakeLists.txt
+++ b/ksystemlog/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(KSystemLog)
 
-find_package(KDE4 4.14.3 REQUIRED)
-
-include(KDE4Defaults)
-include(MacroLibrary)
-
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)

diff --git a/kuser/CMakeLists.txt b/kuser/CMakeLists.txt
index b0d6729..df7d8bb 100644 (file)
--- a/kuser/CMakeLists.txt
+++ b/kuser/CMakeLists.txt
@@ -1,11 +1,5 @@
 project(kuser)
 
-# search packages used by KDE
-find_package(KDE4 4.14.3 REQUIRED)
-include (KDE4Defaults)
-include (MacroLibrary)
-
-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)
@@ -52,30 +46,27 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ku_config.h.cmake ${CMAKE_CURRENT_BIN
 
 
 set(kuser_SRCS
-       ku_mainwidget.cpp
-       ku_mainview.cpp
-       ku_edituser.cpp
-       ku_editgroup.cpp
-       ku_usermodel.cpp
-       ku_groupmodel.cpp
-       ku_deluser.cpp
-       ku_user.cpp
-       ku_group.cpp
-       ku_main.cpp
-       ku_misc.cpp
-       ku_pwdlg.cpp
-       ku_adduser.cpp
-       ku_configdlg.cpp
-       ku_global.cpp
-       sid.cpp
-       ku_userfiles.cpp
-       ku_groupfiles.cpp
-       ku_usersystem.cpp
-       ku_groupsystem.cpp
-       ku_selectconn.cpp
-       ku_filessettings.ui
-       ku_generalsettings.ui
-       ku_passwordpolicy.ui
+    ku_mainwidget.cpp
+    ku_mainview.cpp
+    ku_edituser.cpp
+    ku_editgroup.cpp
+    ku_usermodel.cpp
+    ku_groupmodel.cpp
+    ku_deluser.cpp
+    ku_user.cpp
+    ku_group.cpp
+    ku_main.cpp
+    ku_misc.cpp
+    ku_pwdlg.cpp
+    ku_adduser.cpp
+    ku_configdlg.cpp
+    ku_global.cpp
+    sid.cpp
+    ku_userfiles.cpp
+    ku_groupfiles.cpp
+    ku_usersystem.cpp
+    ku_groupsystem.cpp
+    ku_selectconn.cpp
 )
 
 kde4_add_kcfg_files(kuser_SRCS ku_prefs.kcfgc)

diff --git a/kvkbd/CMakeLists.txt b/kvkbd/CMakeLists.txt
index f5b2857..b6d23ec 100644 (file)
--- a/kvkbd/CMakeLists.txt
+++ b/kvkbd/CMakeLists.txt
@@ -1,10 +1,5 @@
-cmake_minimum_required(VERSION 2.4)
 project( kvkbd )
 
-find_package(KDE4 REQUIRED)
-
-include (KDE4Defaults)
-
 add_subdirectory( src )
 add_subdirectory( pics )
 add_subdirectory( colors )

diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index 0f3c96f..16cb281 100644 (file)
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -1,12 +1,12 @@
 project(okular)
 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
-
 macro_optional_find_package(QImageBlitz)
-macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "An image effects library" "http://sourceforge.net/projects/qimageblitz" TRUE "kdesupport" "Required to build Okular.")
+set_package_properties(QImageBlitz PROPERTIES
+    DESCRIPTION "An image effects library"
+    URL "http://sourceforge.net/projects/qimageblitz"
+    PURPOSE "Required to build Okular."
+    TYPE REQUIRED
+)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)