generic: build system cleanups

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

kinit/CMakeLists.txt

@@ -11,6 +11,7 @@ include_directories(${KDE4_KPARTS_INCLUDES})
 include(CheckFunctionExists)
 include(CheckIncludeFiles)
 include(CheckVariableExists)
+
 check_variable_exists(__progname HAVE___PROGNAME)
 check_variable_exists(__progname_full HAVE___PROGNAME_FULL)
 check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H)
@@ -19,17 +20,19 @@ check_include_files(unistd.h HAVE_UNISTD_H)
 check_function_exists(pstat HAVE_PSTAT)
 check_function_exists(setproctitle HAVE_SETPROCTITLE)
 
-
 # used by 4 executables in this file
 set(KINIT_SOCKET_LIBRARY)
 if(HAVE_SOCKET_LIBRARY)
     set(KINIT_SOCKET_LIBRARY socket)
 endif()
 
-
 ########### kdeinit4 ###############
 
-set(kdeinit_SRCS kinit.cpp proctitle.cpp klauncher_cmds.cpp)
+set(kdeinit_SRCS
+    kinit.cpp
+    proctitle.cpp
+    klauncher_cmds.cpp
+)
 
 add_executable(kdeinit4 ${kdeinit_SRCS})
 
@@ -42,9 +45,7 @@ install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### kwrapper4 ###############
 
-set(kwrapper_SRCS kwrapper.c)
+add_executable(kwrapper4 kwrapper.c)
-
-add_executable(kwrapper4 ${kwrapper_SRCS})
 
 target_link_libraries(kwrapper4 ${KINIT_SOCKET_LIBRARY})
 
@@ -73,9 +74,7 @@ install(TARGETS kshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### lnusertemp ###############
 
-set(lnusertemp_SRCS lnusertemp.c)
+add_executable(lnusertemp lnusertemp.c)
-
-add_executable(lnusertemp ${lnusertemp_SRCS})
 
 target_link_libraries(lnusertemp kdefakes)
 
@@ -84,9 +83,7 @@ install(TARGETS lnusertemp DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ########### kioslave ###############
 
-set(kioslave_SRCS kioslave.cpp)
+add_executable(kioslave kioslave.cpp)
-
-add_executable(kioslave ${kioslave_SRCS})
 
 target_link_libraries(kioslave ${KDE4_KIO_LIBS})
 
@@ -118,7 +115,8 @@ install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR})
 ########### install files ###############
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml
     DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
 )
 

kinit/tests/CMakeLists.txt

@@ -1,7 +1,5 @@
 include_directories(${KDE4_KIO_INCLUDES})
 
-set(klaunchertest_SRCS klaunchertest.cpp )
+kde4_add_manual_test(klaunchertest klaunchertest.cpp)
-
-kde4_add_manual_test(klaunchertest ${klaunchertest_SRCS})
 
 target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} kio)

kio/CMakeLists.txt

@@ -2,16 +2,16 @@ project(kio)
 
 if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
     set(KIO_NO_SOLID TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 if(NOT STRIGI_FOUND)
     set(KIO_NO_STRIGI TRUE)
-endif(NOT STRIGI_FOUND)
+endif()
 
 if(OPENSSL_FOUND)
     set(KSSL_HAVE_SSL 1)
     include_directories(${OPENSSL_INCLUDE_DIR})
-endif(OPENSSL_FOUND)
+endif()
 
 # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all
 include_directories(
@@ -19,29 +19,41 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/kio
     ${CMAKE_CURRENT_SOURCE_DIR}/kfile
     ${CMAKE_CURRENT_SOURCE_DIR}/kssl
-   ${CMAKE_CURRENT_SOURCE_DIR}      # for including kio/kio_export.h
+    # for including kio/kio_export.h
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/kio
     ${CMAKE_CURRENT_BINARY_DIR}/kssl
-   ${CMAKE_CURRENT_BINARY_DIR}      # e.g. for observer_stub.h
+    # e.g. for observer_stub.h
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${KDE4_KDEUI_INCLUDES}
-   ${KDE4_KDECORE_INCLUDES}/
+    ${KDE4_KDECORE_INCLUDES}
     ${ZLIB_INCLUDE_DIR}
-
 )
+
 if(NOT KIO_NO_STRIGI)
     include_directories(${STRIGI_INCLUDE_DIR})
-   set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY})
+    set(KIO_EXTRA_LIBS
+        ${KIO_EXTRA_LIBS}
+        ${STRIGI_STREAMANALYZER_LIBRARY}
+        ${STRIGI_STREAMS_LIBRARY}
+    )
 endif()
 
 if(NOT KIO_NO_SOLID)
     include_directories(${CMAKE_BINARY_DIR}/solid/)
     include_directories(${CMAKE_SOURCE_DIR}/solid/)
     set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
-endif(NOT KIO_NO_SOLID)
+endif()
 
-configure_file(kio/config-kio.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kio.h )
+configure_file(
+    kio/config-kio.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kio.h
+)
 
-configure_file(kssl/ksslconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h )
+configure_file(
+    kssl/ksslconfig.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h
+)
 # macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h )
 
 add_subdirectory(kssl/kcm)
@@ -135,17 +147,27 @@ if(NOT KIO_NO_SOLID)
         ${kiocore_STAT_SRCS}
         kio/kstatusbarofflineindicator.cpp
     )
-endif(NOT KIO_NO_SOLID)
+endif()
 
-qt4_add_dbus_adaptor(kiocore_STAT_SRCS kio/org.kde.kio.FileUndoManager.xml fileundomanager_p.h KIO::FileUndoManagerPrivate fileundomanager_adaptor KIOFileUndoManagerAdaptor)
+qt4_add_dbus_adaptor(kiocore_STAT_SRCS
+    kio/org.kde.kio.FileUndoManager.xml
+    fileundomanager_p.h KIO::FileUndoManagerPrivate
+    fileundomanager_adaptor
+    KIOFileUndoManagerAdaptor
+)
 
-qt4_add_dbus_interface(kiocore_STAT_SRCS kio/org.kde.kuiserver.xml kuiserver_interface)
+qt4_add_dbus_interface(kiocore_STAT_SRCS
+    kio/org.kde.kuiserver.xml
+    kuiserver_interface
+)
 
 set_source_files_properties(kio/org.kde.KPasswdServer.xml
    PROPERTIES INCLUDE kio/authinfo.h
 )
-qt4_add_dbus_interface(kiocore_STAT_SRCS kio/org.kde.KPasswdServer.xml kpasswdserver_interface)
+qt4_add_dbus_interface(kiocore_STAT_SRCS
-install(FILES kio/org.kde.KPasswdServer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+    kio/org.kde.KPasswdServer.xml
+    kpasswdserver_interface
+)
 
 if(UNIX)
    set(kiocore_STAT_SRCS ${kiocore_STAT_SRCS}
@@ -196,6 +218,8 @@ set(kfile_STAT_SRCS
     kfile/kurlrequesterdialog.cpp
     kfile/kfilemetadatareader.cpp
     kfile/kfilemetadataprovider.cpp
+    kfile/kfilesharedialog.cpp
+    kfile/kfsprocess.cpp
 )
 
 if(NOT KIO_NO_SOLID)
@@ -205,13 +229,7 @@ if(NOT KIO_NO_SOLID)
         kfile/kdevicelistitem.cpp
         kfile/kdevicelistmodel.cpp
     )
-endif(NOT KIO_NO_SOLID)
+endif()
-
-set(kfile_STAT_SRCS
-    ${kfile_STAT_SRCS}
-    kfile/kfilesharedialog.cpp
-    kfile/kfsprocess.cpp
-)
 
 qt4_add_resources(kfile_STAT_SRCS kfile/kacleditwidget.qrc)
 
@@ -234,21 +252,6 @@ set(kssl_STAT_SRCS
 
 ########### next target ###############
 
-
-
-set(kio_LIB_SRCS
-   ${kiocore_STAT_SRCS}
-   ${kbookmarks_STAT_SRCS}
-   ${kfile_STAT_SRCS}
-   ${kssl_STAT_SRCS}
-   kfile/kpropertiesdesktopadvbase.ui
-   kfile/kpropertiesdesktopbase.ui
-   kssl/keygenwizard.ui
-   kssl/keygenwizard2.ui
-   kssl/sslinfo.ui
-   kssl/certificateparty.ui
-)
-
 set(kio_LIB_PRIVATE_SRCS
     kio/kfileshare_p.h
     kio/krun_p.h
@@ -264,28 +267,56 @@ add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
 
 add_executable(kfilemetadatareader ${kfilemetadatareaderprocess_SRCS})
 target_link_libraries(kfilemetadatareader ${KDE4_KIO_LIBS})
-target_link_libraries(kio PRIVATE ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS})
+target_link_libraries(kio PRIVATE
-target_link_libraries(kio PUBLIC kdeui kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} )
+    ${KDE4_KDEUI_LIBS}
+    ${ZLIB_LIBRARY}
+    ${QT_QTSVG_LIBRARY}
+    ${X11_LIBRARIES}
+    ${KIO_EXTRA_LIBS}
+)
+target_link_libraries(kio PUBLIC
+    kdeui
+    kdecore
+    ${QT_QTNETWORK_LIBRARY}
+    ${QT_QTXML_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
+)
 
 if(ACL_FOUND)
     target_link_libraries(kio PRIVATE ${ACL_LIBS})
-endif(ACL_FOUND)
+endif()
 
 if(X11_Xrender_FOUND)
    target_link_libraries(kio PRIVATE ${X11_Xrender_LIB})
-endif(X11_Xrender_FOUND)
+endif()
 
 set_target_properties(kio PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION})
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
 
 
 ########### install files ###############
-install(TARGETS kio EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS kfilemetadatareader ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-install( FILES data.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(
-install( FILES
+    TARGETS kio
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(
+    TARGETS kfilemetadatareader
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(
+    FILES
+    data.protocol
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES
     application.desktop
     kcmodule.desktop
     kcmoduleinit.desktop
@@ -298,9 +329,11 @@ install( FILES
     kio/kfilewrite.desktop
     kio/kfileitemactionplugin.desktop
     kfile/kiofilemodule.desktop
-DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
 
-install(  FILES
+install(
+    FILES
     kio/kio_export.h
     kio/accessmanager.h
     kio/connection.h
@@ -337,12 +370,19 @@ install(  FILES
     kio/skipdialog.h
     kio/udsentry.h
     kssl/sslui.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel)
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kio
+    COMPONENT Devel
+)
 
-install( FILES kfile/kfilesharedialog.h
+install(
-         DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
+    FILES
+    kfile/kfilesharedialog.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+    COMPONENT Devel
+)
 
-install( FILES
+install(
+    FILES
     kio/kabstractfileitemactionplugin.h
     kio/kacl.h
     kio/kautomount.h
@@ -406,21 +446,37 @@ install( FILES
     bookmarks/kbookmarkdombuilder.h
     bookmarks/konqbookmarkmenu.h
     bookmarks/kbookmarkdialog.h
-  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+    COMPONENT Devel
+)
 
 if(NOT KIO_NO_SOLID)
-install( FILES
+    install(
+        FILES
         kfile/kdevicelistmodel.h
         kio/kstatusbarofflineindicator.h
-  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
+        DESTINATION ${INCLUDE_INSTALL_DIR}
-endif(NOT KIO_NO_SOLID)
+        COMPONENT Devel
+    )
+endif()
 
-install(FILES
+install(
+    FILES
     kio/org.kde.KDirNotify.xml
     kio/org.kde.kio.FileUndoManager.xml
-   DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+    kio/org.kde.KPasswdServer.xml
+    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+)
 
 
-install(FILES kio/accept-languages.codes DESTINATION ${CONFIG_INSTALL_DIR})
+install(
+    FILES
+    kio/accept-languages.codes
+    DESTINATION ${CONFIG_INSTALL_DIR}
+)
 
-install(FILES kssl/ca-bundle.crt DESTINATION ${DATA_INSTALL_DIR}/kssl )
+install(
+    FILES
+    kssl/ca-bundle.crt DESTINATION
+    ${DATA_INSTALL_DIR}/kssl
+)

kio/kssl/kcm/CMakeLists.txt

@@ -4,13 +4,17 @@ set(kcmssl_SRCS
     kcmssl.cpp
     cacertificatespage.cpp
     displaycertdialog.cpp
-    cacertificates.ui
-    displaycert.ui
 )
 
 kde4_add_plugin(kcm_ssl ${kcmssl_SRCS})
 target_link_libraries(kcm_ssl ${KDE4_KIO_LIBS})
-install(TARGETS kcm_ssl DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
-install(FILES kcm_ssl.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+install(TARGETS kcm_ssl DESTINATION ${PLUGIN_INSTALL_DIR})
+
+install(
+    FILES
+    kcm_ssl.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)

kio/misc/CMakeLists.txt

@@ -8,32 +8,52 @@ add_subdirectory( kntlm )
 
 ########### next target ###############
 
-set(kmailservice_SRCS kmailservice.cpp )
+add_executable(kmailservice kmailservice.cpp)
-
-
-add_executable(kmailservice ${kmailservice_SRCS})
 
 target_link_libraries(kmailservice ${KDE4_KDEUI_LIBS})
 
-install(TARGETS kmailservice ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
-install(PROGRAMS kmailservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+    TARGETS kmailservice
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(
+    PROGRAMS kmailservice.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
 
 ########### next target ###############
 
-set(ktelnetservice_SRCS ktelnetservice.cpp )
+add_executable(ktelnetservice ktelnetservice.cpp)
-
-add_executable(ktelnetservice ${ktelnetservice_SRCS})
 
 target_link_libraries(ktelnetservice ${KDE4_KDEUI_LIBS})
 
-install(TARGETS ktelnetservice ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
-install(PROGRAMS ktelnetservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+    TARGETS ktelnetservice
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(
+    PROGRAMS ktelnetservice.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES rtsp.protocol mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(
+    FILES
+    rtsp.protocol
+    mms.protocol
+    mmst.protocol
+    mmsu.protocol
+    pnm.protocol
+    rtspt.protocol
+    rtspu.protocol
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
 
-install(PROGRAMS fileshareset DESTINATION ${LIBEXEC_INSTALL_DIR} )
+install(
+    PROGRAMS fileshareset
+    DESTINATION ${LIBEXEC_INSTALL_DIR}
+)
 
 install(CODE "
     set(FILESHARESET_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/fileshareset\")
@@ -43,4 +63,6 @@ install(CODE "
 # write a cmake script file which creates the symlink
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIBEXEC_INSTALL_DIR}/fileshareset \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/filesharelist\")\n")
 # and add it as post-install script to any of the installed targets, so it will be executed during "make install"
-set_target_properties(ktelnetservice PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake)
+set_target_properties(ktelnetservice PROPERTIES
+    POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake
+)

kio/misc/kntlm/CMakeLists.txt

@@ -1,13 +1,25 @@
-
 set(kntlm_LIB_SRCS kntlm.cpp des.cpp )
 
 add_library(kntlm ${LIBRARY_TYPE} ${kntlm_LIB_SRCS})
 
 target_link_libraries(kntlm  ${KDE4_KDECORE_LIBS})
 
-set_target_properties(kntlm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+set_target_properties(kntlm PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
 
-install(TARGETS kntlm EXPORT kdelibsLibraryTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kntlm
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
-install( FILES kntlm_export.h kntlm.h  DESTINATION  ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel)
+install(
+    FILES
+    kntlm_export.h
+    kntlm.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kio
+    COMPONENT Devel
+)
 

kio/misc/kpac/CMakeLists.txt

@@ -1,19 +1,23 @@
 
 if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(KPAC_NO_SOLID TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/kded)
 
 if(NOT KPAC_NO_SOLID)
-    include_directories(${CMAKE_BINARY_DIR}/solid/)
+    include_directories(${CMAKE_BINARY_DIR}/solid)
-    include_directories(${CMAKE_SOURCE_DIR}/solid/)
+    include_directories(${CMAKE_SOURCE_DIR}/solid)
     set(KPAC_EXTRA_LIBS ${KDE4_SOLID_LIBS})
-endif(NOT KPAC_NO_SOLID)
+endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
 include(ConfigureChecks.cmake)
-configure_file(config-kpac.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpac.h)
+configure_file(
+    config-kpac.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kpac.h
+)
 
 ########### next target ###############
 
@@ -26,34 +30,51 @@ set(kded_proxyscout_PART_SRCS
 
 kde4_add_plugin(kded_proxyscout ${kded_proxyscout_PART_SRCS})
 
-target_link_libraries(kded_proxyscout ${QT_QTSCRIPT_LIBRARY} ${KPAC_EXTRA_LIBS} ${KDE4_KDECORE_LIBS} kio)
+target_link_libraries(kded_proxyscout
+    ${QT_QTSCRIPT_LIBRARY}
+    ${KPAC_EXTRA_LIBS}
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KIO_LIBS}
+)
 
 # this needs -lresolv e.g on Slackware, but not on FreeBSD
 if(HAVE_RESOLV_LIBRARY)
     target_link_libraries(kded_proxyscout resolv)
-endif (HAVE_RESOLV_LIBRARY)
+endif()
 
-install(TARGETS kded_proxyscout  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(
+    TARGETS kded_proxyscout
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 ########### next target ###############
 
-set(kpac_dhcp_helper_SRCS kpac_dhcp_helper.c)
+add_executable(kpac_dhcp_helper kpac_dhcp_helper.c)
-
-add_executable(kpac_dhcp_helper ${kpac_dhcp_helper_SRCS})
 
 if(HAVE_NSL_LIBRARY)
     # Assume Solaris
     target_link_libraries(kpac_dhcp_helper nsl)
-endif (HAVE_NSL_LIBRARY)
+endif()
 
 if (HAVE_SOCKET_LIBRARY)
     target_link_libraries(kpac_dhcp_helper socket)
-endif (HAVE_SOCKET_LIBRARY)
+endif()
 
-install(TARGETS kpac_dhcp_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )
+install(
+    TARGETS kpac_dhcp_helper
+    DESTINATION ${LIBEXEC_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES proxyscout.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/proxyscout )
+install(
-install( FILES proxyscout.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kded )
+    FILES
+    proxyscout.notifyrc
+    DESTINATION ${DATA_INSTALL_DIR}/proxyscout
+)
+install(
+    FILES
+    proxyscout.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+)
 

kioslave/file/CMakeLists.txt

@@ -1,11 +1,12 @@
-
 project(kioslave-file)
 
 include_directories(${KDE4_KIO_INCLUDES})
 
 include(ConfigureChecks.cmake)
-configure_file(config-kioslave-file.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-file.h )
+configure_file(
-
+    config-kioslave-file.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-file.h
+)
 
 ########### next target ###############
 
@@ -17,11 +18,11 @@ target_link_libraries(kio_file  ${KDE4_KDECORE_LIBS} kio )
 
 if (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
     target_link_libraries(kio_file -lvolmgt)
-endif (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
+endif()
 
 if(ACL_FOUND)
     target_link_libraries(kio_file ${ACL_LIBS})
-endif(ACL_FOUND)
+endif()
 
 install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -29,7 +30,3 @@ install(TARGETS kio_file  DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install(FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-

knotify/CMakeLists.txt

@@ -27,13 +27,17 @@ set_target_properties(knotifyconfig PROPERTIES
    VERSION ${GENERIC_LIB_VERSION}
    SOVERSION ${GENERIC_LIB_SOVERSION}
 )
-install(TARGETS knotifyconfig EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS knotifyconfig
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
 ########### install files ###############
-install( FILES knotifyconfig_export.h knotifyconfigwidget.h  DESTINATION  ${INCLUDE_INSTALL_DIR}  COMPONENT Devel)
+install(
-
+    FILES
-
+    knotifyconfig_export.h
-
+    knotifyconfigwidget.h
-
+    DESTINATION ${INCLUDE_INSTALL_DIR}
-
+    COMPONENT Devel
-
+)

knotify/tests/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../config )
 
 ########### knotifytest ###############
 
-set(knotifytest_SRCS main.cpp knotifytestwindow.cpp knotifytestview.ui)
+set(knotifytest_SRCS main.cpp knotifytestwindow.cpp)
 
 kde4_add_manual_test(knotifytest ${knotifytest_SRCS})
 

kparts/CMakeLists.txt

@@ -6,7 +6,6 @@ endif()
 
 include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR})
 
-
 ########### next target ###############
 
 set(kparts_LIB_SRCS
@@ -32,21 +31,57 @@ set(kparts_LIB_SRCS
 add_library(kparts ${LIBRARY_TYPE} ${kparts_LIB_SRCS})
 
 target_link_libraries(kparts PRIVATE ${KDE4_KDECORE_LIBS} kdeui kio)
-target_link_libraries(kparts PUBLIC kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} )
+target_link_libraries(kparts PUBLIC
+    kio
+    kdeui
+    kdecore
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
+)
 
 set_target_properties(kparts PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-install(TARGETS kparts EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kparts
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
 ########### install files ###############
 
-install( FILES kpart.desktop krop.desktop krwp.desktop browserview.desktop   DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+install(
-install( FILES kparts_export.h part.h plugin.h partmanager.h mainwindow.h event.h
+    FILES
-         browserextension.h factory.h historyprovider.h browserinterface.h
+    kpart.desktop
-         componentfactory.h browserrun.h statusbarextension.h browseropenorsavequestion.h
+    krop.desktop
-         scriptableextension.h textextension.h htmlextension.h fileinfoextension.h
+    krwp.desktop
+    browserview.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+install(
+    FILES
+    kparts_export.h
+    part.h
+    plugin.h
+    partmanager.h
+    mainwindow.h
+    event.h
+    browserextension.h
+    factory.h
+    historyprovider.h
+    browserinterface.h
+    componentfactory.h
+    browserrun.h
+    statusbarextension.h
+    browseropenorsavequestion.h
+    scriptableextension.h
+    textextension.h
+    htmlextension.h
+    fileinfoextension.h
     listingextension.h
-         DESTINATION  ${INCLUDE_INSTALL_DIR}/kparts COMPONENT Devel )
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kparts
+    COMPONENT Devel
+)

kpty/CMakeLists.txt

@@ -10,21 +10,31 @@ set(kpty_LIB_SRCS
 
 add_library(kpty ${LIBRARY_TYPE} ${kpty_LIB_SRCS})
 
-target_link_libraries(kpty PRIVATE ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
+target_link_libraries(kpty PRIVATE
+    ${KDE4_KDECORE_LIBS}
+    ${UTIL_LIBRARY}
+    ${UTEMPTER_LIBRARY}
+)
 target_link_libraries(kpty PUBLIC kdecore ${QT_QTCORE_LIBRARY})
 
 set_target_properties(kpty PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
-install(TARGETS kpty EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kpty
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
-install(FILES
+install(
+    FILES
     kpty_export.h
     kpty.h
     kptydevice.h
     kptyprocess.h
-   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+    COMPONENT Devel
 )
 
 ########### next target ###############
@@ -33,7 +43,7 @@ if(NOT HAVE_OPENPTY)
     add_executable(kgrantpty kgrantpty.c)
     target_link_libraries(kgrantpty kdefakes)
     install(TARGETS kgrantpty DESTINATION ${LIBEXEC_INSTALL_DIR})
-endif(NOT HAVE_OPENPTY)
+endif()
 
 if(ENABLE_TESTING)
     add_subdirectory(tests)

kross/CMakeLists.txt

@@ -1,16 +1,9 @@
-# the core library
 add_subdirectory(core)
-# the ui library
 add_subdirectory(ui)
-# optional modules
 add_subdirectory(modules)
-# commandline-prog to run scripts
 add_subdirectory(console)
+add_subdirectory(qts)
 
-# unittests and such stuff
 if(ENABLE_TESTING)
     add_subdirectory(test)
 endif()
-
-# QtScript backend
-add_subdirectory( qts )

kross/core/CMakeLists.txt

@@ -19,8 +19,6 @@ add_library(krosscore ${LIBRARY_TYPE} ${krosscore_LIB_SRCS})
 target_link_libraries(krosscore PRIVATE
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
-    ${QT_QTSCRIPT_LIBRARY}
-    ${QT_QTXML_LIBRARY}
 )
 target_link_libraries(krosscore PUBLIC
     kdecore
@@ -33,9 +31,14 @@ set_target_properties(krosscore PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-install(TARGETS krosscore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS krosscore
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
-install(FILES
+install(
+    FILES
     kross_export.h
     krossconfig.h
     errorinterface.h
@@ -49,4 +52,6 @@ install(FILES
     actioncollection.h
     manager.h
     object.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kross/core COMPONENT Devel)
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kross/core
+    COMPONENT Devel
+)

kross/modules/CMakeLists.txt

@@ -10,18 +10,26 @@ if( QT_QTDESIGNER_FOUND )
     ############################################
     # the forms module
 
-	set(krossmoduleforms_SRCS form.cpp)
+    kde4_add_plugin(krossmoduleforms form.cpp)
-	kde4_add_plugin(krossmoduleforms ${krossmoduleforms_SRCS})
 
-	target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui)
+    target_link_libraries(krossmoduleforms
+        ${QT_QTUITOOLS_LIBRARY}
+        ${KDE4_KPARTS_LIBS}
+        ${KDE4_KFILE_LIBS}
+        krosscore
+        krossui
+    )
     install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
-endif( QT_QTDESIGNER_FOUND )
+endif()
 
 ############################################
 # the kdetranslation module
 
-set(krossmodulekdetranslation_SRCS translation.cpp)
+kde4_add_plugin(krossmodulekdetranslation translation.cpp)
-kde4_add_plugin(krossmodulekdetranslation ${krossmodulekdetranslation_SRCS})
 
-target_link_libraries(krossmodulekdetranslation ${KDE4_KPARTS_LIBS} ${KDE4_CORE_LIBS} krosscore)
+target_link_libraries(krossmodulekdetranslation
+    ${KDE4_KPARTS_LIBS}
+    ${KDE4_CORE_LIBS}
+    krosscore
+)
 install(TARGETS krossmodulekdetranslation DESTINATION ${PLUGIN_INSTALL_DIR})

kross/test/CMakeLists.txt

@@ -1,4 +1,3 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(${KDE4_KIO_INCLUDES})
 
 set(krosstest_SRCS
@@ -6,8 +5,6 @@ set(krosstest_SRCS
     main.cpp
 )
 
-
 kde4_add_manual_test(krosstest ${krosstest_SRCS})
 
 target_link_libraries(krosstest ${KDE4_KDEUI_LIBS} krosscore)
-

kross/ui/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories(
     ${KDE4_KIO_INCLUDES}
 )
 
-
 set(krossui_LIB_SRCS
     model.cpp
     view.cpp
@@ -14,15 +13,31 @@ set(krossui_LIB_SRCS
 )
 
 add_library(krossui ${LIBRARY_TYPE} ${krossui_LIB_SRCS})
-target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(krossui
-set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} 
+    krosscore
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KPARTS_LIBS}
+    ${KDE4_KIO_LIBS}
+)
+set_target_properties(krossui PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION} 
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-
-install(TARGETS krossui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-
 ########### install files ###############
 
-#install(FILES guiclient.h model.h view.h DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui)
+install(
-install(FILES model.h view.h plugin.h DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui COMPONENT Devel)
+    TARGETS krossui
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(
+    FILES
+    # guiclient.h
+    model.h
+    view.h
+    plugin.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui
+    COMPONENT Devel
+)

kunitconversion/CMakeLists.txt

@@ -5,7 +5,10 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(KUNITCONVERSION_NO_KIO TRUE)
 endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kunitconversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kunitconversion.h)
+configure_file(
+    config-kunitconversion.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kunitconversion.h
+)
 
 if(ENABLE_TESTING)
     add_subdirectory(tests)
@@ -35,34 +38,64 @@ set(kunitconversion_LIB_SRCS
     frequency.cpp
 )
 
-set(kunitconversion_HEADERS
+add_definitions(-DKDE_DEFAULT_DEBUG_AREA=930)
+
+if(NOT KUNITCONVERSION_NO_KIO)
+    include_directories(${KDE4_KIO_INCLUDES})
+    set(KUNITCONVERSION_EXTRA_LIBS
+        ${KUNITCONVERSION_EXTRA_LIBS}
+        ${KDE4_KIO_LIBS}
+    )
+else()
+    set(KUNITCONVERSION_EXTRA_LIBS
+        ${KUNITCONVERSION_EXTRA_LIBS}
+        ${QT_QTNETWORK_LIBRARY}
+        ${QT_QTXML_LIBRARY}
+    )
+endif()
+
+if(NOT KUNITCONVERSION_NO_SOLID)
+    include_directories(
+        ${CMAKE_BINARY_DIR}/solid
+        ${CMAKE_SOURCE_DIR}/solid
+    )
+    set(KUNITCONVERSION_EXTRA_LIBS
+        ${KUNITCONVERSION_EXTRA_LIBS}
+        ${KDE4_SOLID_LIBS}
+    )
+endif()
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}
+    ${KDE4_KDECORE_INCLUDES}
+    ${KDE4_KDEUI_INCLUDES}
+)
+
+add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})
+
+target_link_libraries(kunitconversion
+    ${KDE4_KDECORE_LIBS}
+    ${KUNITCONVERSION_EXTRA_LIBS}
+)
+
+set_target_properties(kunitconversion PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+install(
+    TARGETS kunitconversion
+    EXPORT kdelibsLibraryTargets
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(
+    FILES
     converter.h
     value.h
     unit.h
     unitcategory.h
     kunitconversion_export.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion
+    COMPONENT Devel
 )
-
-add_definitions(-DKDE_DEFAULT_DEBUG_AREA=930)
-
-if(NOT KUNITCONVERSION_NO_KIO)
-    include_directories(${KDE4_KIO_INCLUDES})
-    set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${KDE4_KIO_LIBS})
-else(NOT KUNITCONVERSION_NO_KIO)
-    set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY})
-endif(NOT KUNITCONVERSION_NO_KIO)
-
-if(NOT KUNITCONVERSION_NO_SOLID)
-    include_directories(${CMAKE_BINARY_DIR}/solid/)
-    include_directories(${CMAKE_SOURCE_DIR}/solid/)
-    set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
-endif(NOT KUNITCONVERSION_NO_SOLID)
-
-include_directories (${CMAKE_SOURCE_DIR} ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES})
-
-
-add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})
-target_link_libraries(kunitconversion ${KDE4_KDECORE_LIBS} ${KUNITCONVERSION_EXTRA_LIBS})
-set_target_properties(kunitconversion PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kunitconversion EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${kunitconversion_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion COMPONENT Devel)