OSDN Git Service

generic: build system cleanups
authorIvailo Monev <xakepa10@gmail.com>
Fri, 6 Nov 2015 03:56:50 +0000 (05:56 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Fri, 6 Nov 2015 03:56:50 +0000 (05:56 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
15 files changed:
appmenu/CMakeLists.txt
cursors/CMakeLists.txt
drkonqi/CMakeLists.txt
drkonqi/data/CMakeLists.txt
drkonqi/parser/CMakeLists.txt [deleted file]
drkonqi/tests/backtraceparsertest/CMakeLists.txt
freespacenotifier/CMakeLists.txt
kcheckpass/CMakeLists.txt
kcminit/CMakeLists.txt
kcmshell/CMakeLists.txt
kcontrol/access/CMakeLists.txt
kcontrol/autostart/CMakeLists.txt
kcontrol/colors/CMakeLists.txt
kde-menu/CMakeLists.txt
kdeeject/CMakeLists.txt

index 7bba52e..351d212 100644 (file)
@@ -15,11 +15,20 @@ set(kded_appmenu_SRCS
     shadows.cpp
 )
 
-qt4_add_dbus_adaptor(kded_appmenu_SRCS com.canonical.AppMenu.Registrar.xml
-    menuimporter.h MenuImporter menuimporteradaptor MenuImporterAdaptor)
+qt4_add_dbus_adaptor(kded_appmenu_SRCS
+    com.canonical.AppMenu.Registrar.xml
+    menuimporter.h MenuImporter
+    menuimporteradaptor
+    MenuImporterAdaptor
+)
 
-qt4_add_dbus_adaptor(kded_appmenu_SRCS org.kde.kded.appmenu.xml
-    appmenu_dbus.h AppmenuDBus appmenuadaptor AppmenuAdaptor)
+qt4_add_dbus_adaptor(kded_appmenu_SRCS
+    org.kde.kded.appmenu.xml
+    appmenu_dbus.h
+    AppmenuDBus
+    appmenuadaptor
+    AppmenuAdaptor
+)
 
 kde4_add_plugin(kded_appmenu ${kded_appmenu_SRCS})
 
@@ -30,10 +39,20 @@ target_link_libraries(kded_appmenu
     ${KDE4_PLASMA_LIBS}
 )
 
-install(TARGETS kded_appmenu  DESTINATION ${PLUGIN_INSTALL_DIR} )
+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
+    org.kde.kded.appmenu.xml
+    DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+)
index 5636f80..78861ba 100644 (file)
@@ -6,6 +6,8 @@ set(cursors_folders
 )
 
 foreach(theme ${cursors_folders})
-    install(DIRECTORY ${theme} DESTINATION ${ICON_INSTALL_DIR})
-endforeach(theme)
-
+    install(
+        DIRECTORY ${theme}
+        DESTINATION ${ICON_INSTALL_DIR}
+    )
+endforeach()
index 28085e1..11c080c 100644 (file)
@@ -3,19 +3,18 @@ project(drkonqi)
 check_function_exists("strsignal" HAVE_STRSIGNAL)
 check_function_exists("uname" HAVE_UNAME)
 
-if (NOT DEBUG_PACKAGE_INSTALLER_NAME)
+if(NOT DEBUG_PACKAGE_INSTALLER_NAME)
     set (DEBUG_PACKAGE_INSTALLER_NAME "installdbgsymbols.sh")
-endif (NOT DEBUG_PACKAGE_INSTALLER_NAME)
+endif()
 
-configure_file (config-drkonqi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-drkonqi.h )
+configure_file(
+    config-drkonqi.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-drkonqi.h
+)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1410)
 
-add_subdirectory( data )
-add_subdirectory( parser )
-if(ENABLE_TESTING)
-    add_subdirectory(tests)
-endif()
+add_subdirectory(data)
 
 set(drkonqi_SRCS
     main.cpp
@@ -34,20 +33,28 @@ set(drkonqi_SRCS
     debuggerlaunchers.cpp
     debuggermanager.cpp
     gdbhighlighter.cpp
-    maindialog.ui
-    backtracewidget.ui
 )
 
+set(backtrace_parser_SRCS
+    parser/backtraceparser.cpp
+    parser/backtraceparsergdb.cpp
+    parser/backtraceparsernull.cpp
+)
+
+if(ENABLE_TESTING)
+    add_library(drkonqi_backtrace_parser STATIC ${backtrace_parser_SRCS})
+    add_subdirectory(tests)
+endif()
+
 # if BACKTRACE_PARSER_DEBUG is enabled, it will show both the
 # parsed and the unparsed backtrace in the backtrace widget.
 # Comment this out for release.
 #add_definitions(-DBACKTRACE_PARSER_DEBUG)
 
-add_executable(drkonqi ${drkonqi_SRCS})
+add_executable(drkonqi ${drkonqi_SRCS} ${backtrace_parser_SRCS})
 
 target_link_libraries(drkonqi
     ${KDE4_KIO_LIBS}
-    drkonqi_backtrace_parser
 )
 
 install(TARGETS drkonqi DESTINATION ${LIBEXEC_INSTALL_DIR})
index f74a838..d8a73f6 100644 (file)
@@ -1,2 +1,9 @@
-install(FILES crash.png DESTINATION ${DATA_INSTALL_DIR}/drkonqi/pics)
-install(DIRECTORY debuggers DESTINATION ${DATA_INSTALL_DIR}/drkonqi PATTERN ".svn" EXCLUDE)
+install(
+    FILES crash.png
+    DESTINATION ${DATA_INSTALL_DIR}/drkonqi/pics
+)
+install(
+    DIRECTORY debuggers
+    DESTINATION ${DATA_INSTALL_DIR}/drkonqi
+    PATTERN ".svn" EXCLUDE
+)
diff --git a/drkonqi/parser/CMakeLists.txt b/drkonqi/parser/CMakeLists.txt
deleted file mode 100644 (file)
index 6a42004..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-set(BACKTRACEPARSER_SRCS
-    backtraceparser.cpp
-    backtraceparsergdb.cpp
-    backtraceparsernull.cpp
-)
-
-add_library(drkonqi_backtrace_parser STATIC ${BACKTRACEPARSER_SRCS})
-target_link_libraries(drkonqi_backtrace_parser ${KDE4_KDECORE_LIBS})
index c66a75e..936cbac 100644 (file)
@@ -1,14 +1,30 @@
-kde4_add_test(drkonqi-backtraceparsertest fakebacktracegenerator.cpp backtraceparsertest.cpp)
-target_link_libraries(drkonqi-backtraceparsertest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} drkonqi_backtrace_parser)
+set(backtraceparsertest_SRCS
+    fakebacktracegenerator.cpp
+    backtraceparsertest.cpp
+)
 
-kde4_add_manual_test(backtraceparsertest_manual fakebacktracegenerator.cpp backtraceparsertest_manual.cpp)
+kde4_add_test(drkonqi-backtraceparsertest ${backtraceparsertest_SRCS})
+target_link_libraries(drkonqi-backtraceparsertest
+    ${QT_QTTEST_LIBRARY}
+    ${QT_QTCORE_LIBRARY}
+    drkonqi_backtrace_parser
+)
+
+set(backtraceparsertest_manual_SRCS
+    fakebacktracegenerator.cpp
+    backtraceparsertest_manual.cpp
+)
+kde4_add_manual_test(backtraceparsertest_manual ${backtraceparsertest_manual_SRCS})
 target_link_libraries(backtraceparsertest_manual drkonqi_backtrace_parser)
 
-# create a link so that the data directory can be accessed from the build directory, where the test runs
-if ( NOT ${CMAKE_CURRENT_BINARY_DIR} EQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
-    add_custom_command(TARGET drkonqi-backtraceparsertest POST_BUILD
-                          COMMAND ${CMAKE_COMMAND} -E create_symlink
-                          ${CMAKE_CURRENT_SOURCE_DIR}/backtraceparsertest_data backtraceparsertest_data
-                          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                      )
-endif ( NOT ${CMAKE_CURRENT_BINARY_DIR} EQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
+# create a link so that the data directory can be accessed from the build
+# directory, where the test runs
+if(NOT ${CMAKE_CURRENT_BINARY_DIR} EQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_custom_command(
+        TARGET drkonqi-backtraceparsertest POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+        ${CMAKE_CURRENT_SOURCE_DIR}/backtraceparsertest_data
+        backtraceparsertest_data
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+endif()
index e1c6c07..f762b1b 100644 (file)
@@ -1,23 +1,38 @@
-project (freespacenotifier)
+project(freespacenotifier)
 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
 ########### next target ###############
 
-set(kded_freespacenotifier_SRCS freespacenotifier.cpp module.cpp freespacenotifier_prefs_base.ui)
+set(kded_freespacenotifier_SRCS
+    freespacenotifier.cpp
+    module.cpp
+)
 
-kde4_add_kcfg_files(kded_freespacenotifier_SRCS settings.kcfgc)
+kde4_add_kcfg_files(kded_freespacenotifier_SRCS
+    settings.kcfgc
+)
 
 kde4_add_plugin(kded_freespacenotifier ${kded_freespacenotifier_SRCS})
 
-target_link_libraries(kded_freespacenotifier ${KDE4_KIO_LIBS} )
-
-install(TARGETS kded_freespacenotifier  DESTINATION ${PLUGIN_INSTALL_DIR} )
+target_link_libraries(kded_freespacenotifier ${KDE4_KIO_LIBS})
 
+install(
+    TARGETS kded_freespacenotifier
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES freespacenotifier.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kded )
-install( FILES freespacenotifier.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/freespacenotifier )
-install( FILES freespacenotifier.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
+install(
+    FILES freespacenotifier.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kded
+)
+install(
+    FILES freespacenotifier.notifyrc
+    DESTINATION ${DATA_INSTALL_DIR}/freespacenotifier
+)
+install(
+    FILES freespacenotifier.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
index 5e864b9..6e18c97 100644 (file)
@@ -1,7 +1,11 @@
+include_directories(${UNIXAUTH_INCLUDE_DIRS} )
 
-include_directories( ${UNIXAUTH_INCLUDE_DIRS} )
 check_include_files(paths.h HAVE_PATHS_H)
-configure_file (config-kcheckpass.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcheckpass.h )
+
+configure_file(
+    config-kcheckpass.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kcheckpass.h
+)
 
 set(kcheckpass_SRCS
     kcheckpass.h
@@ -21,8 +25,16 @@ if(KDE4_ENABLE_FPIE)
 endif(KDE4_ENABLE_FPIE)
 
 add_definitions(-U_REENTRANT)
-target_link_libraries(kcheckpass ${KDE4_KDEFAKES_LIBS} ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
-install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+target_link_libraries(kcheckpass
+    ${KDE4_KDEFAKES_LIBS}
+    ${UNIXAUTH_LIBRARIES}
+    ${SOCKET_LIBRARIES}
+)
+
+install(
+    TARGETS kcheckpass
+    DESTINATION ${LIBEXEC_INSTALL_DIR}
+)
 install(CODE "
     set(KCP_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/kcheckpass\")
     EXECUTE_PROCESS(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
index 1f1dabc..587e6b3 100644 (file)
@@ -1,24 +1,21 @@
 ########### next target ###############
 
-set(kcminit_SRCS main.cpp)
+add_executable(kcminit main.cpp)
 
+target_link_libraries(kcminit
+    ${KDE4_KCMUTILS_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${X11_LIBRARIES}
+)
 
-add_executable(kcminit ${kcminit_SRCS})
-
-target_link_libraries(kcminit  ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
-
-install(TARGETS kcminit         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(
+    TARGETS kcminit
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
 ########### next target ###############
 
-# TODO might be simpler to make <whatever>_startup to be a symlink to <whatever>
-
-set(kcminit_startup_SRCS main.cpp)
-
-
-add_executable( kcminit_startup ${kcminit_startup_SRCS})
-
-target_link_libraries(kcminit_startup  ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
-
-install(TARGETS kcminit_startup         ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
+install(
+    CODE "MESSAGE(STATUS \"Symlinking: ${BIN_INSTALL_DIR}/kcminit to: ${BIN_INSTALL_DIR}/kcminit_startup\")"
+    CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/kcminit ${BIN_INSTALL_DIR}/kcminit_startup)"
+)
index 014aa7c..e46317e 100644 (file)
@@ -1,8 +1,11 @@
+add_executable(kcmshell4 main.cpp)
 
-set(kcmshell_SRCS main.cpp )
+target_link_libraries(kcmshell4
+    ${KDE4_KCMUTILS_LIBS}
+    ${KDE4_KDEUI_LIBS}
+)
 
-add_executable( kcmshell4 ${kcmshell_SRCS})
-
-target_link_libraries(kcmshell4 ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} )
-
-install(TARGETS kcmshell4          ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kcmshell4
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
index 8391849..49e4303 100644 (file)
@@ -1,32 +1,49 @@
-
-
-
 ########### next target ###############
 
-set(kcm_access_PART_SRCS kcmaccess.cpp )
-
+kde4_add_plugin(kcm_access kcmaccess.cpp)
 
-kde4_add_plugin(kcm_access ${kcm_access_PART_SRCS})
+target_link_libraries(kcm_access
+    ${KDE4_KIO_LIBS}
+    ${KDE4_PHONON_LIBS}
+    ${KDE4_KNOTIFYCONFIG_LIBS}
+    ${X11_LIBRARIES}
+)
 
-
-target_link_libraries(kcm_access  ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${X11_LIBRARIES})
-
-install(TARGETS kcm_access  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(
+    TARGETS kcm_access
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 
 ########### next target ###############
 
-set(kaccess_SRCS kaccess.cpp main.cpp )
-
+set(kaccess_SRCS
+    kaccess.cpp
+    main.cpp
+)
 
-add_executable( kaccess ${kaccess_SRCS})
+add_executable(kaccess ${kaccess_SRCS})
 
-target_link_libraries(kaccess  ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kaccess
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_PHONON_LIBS}
+    ${X11_LIBRARIES}
+)
 
-install(TARGETS kaccess         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(
+    TARGETS kaccess
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
 
 ########### install files ###############
 
-install( FILES kcmaccess.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES kaccess.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES kaccess.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/kaccess/ )
+install(
+    FILES
+    kcmaccess.desktop
+    kaccess.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+install(
+    FILES kaccess.notifyrc
+    DESTINATION ${DATA_INSTALL_DIR}/kaccess
+)
index b0dbc95..8204a3e 100644 (file)
@@ -1,23 +1,27 @@
-PROJECT (autostart)
+project(autostart)
 
-ADD_DEFINITIONS (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
 ########### next target ###############
 
-SET(kcm_autostart_PART_SRCS
+set(kcm_autostart_PART_SRCS
    autostartitem.cpp
    addscriptdialog.cpp
    advanceddialog.cpp
    autostart.cpp
-   autostartconfig.ui
 )
 
-KDE4_ADD_PLUGIN(kcm_autostart ${kcm_autostart_PART_SRCS})
+kde4_add_plugin(kcm_autostart ${kcm_autostart_PART_SRCS})
 
-TARGET_LINK_LIBRARIES(kcm_autostart   ${KDE4_KIO_LIBS} )
+target_link_libraries(kcm_autostart ${KDE4_KIO_LIBS})
 
 ########### install files ###############
 
-INSTALL(TARGETS kcm_autostart  DESTINATION ${PLUGIN_INSTALL_DIR} )
-INSTALL( FILES autostart.desktop   DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(
+    TARGETS kcm_autostart
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(
+    FILES autostart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
index 71f0e20..d4fffe3 100644 (file)
@@ -3,18 +3,38 @@ set(kcm_colors_PART_SRCS
     colorscm.cpp
     previewwidget.cpp
     setpreviewwidget.cpp
-    colorsettings.ui
-    preview.ui
-    setpreview.ui
 )
 
 kde4_add_plugin(kcm_colors ${kcm_colors_PART_SRCS})
-target_link_libraries(kcm_colors ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_colors
+    ${KDE4_KIO_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${X11_LIBRARIES}
+)
 
-install(TARGETS kcm_colors  DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES colors.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES colorschemes.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} )
+install(
+    TARGETS kcm_colors
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(
+    FILES colors.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+install(
+    FILES colorschemes.knsrc
+    DESTINATION ${CONFIG_INSTALL_DIR}
+)
 
-# built-in color schemes
-FILE(GLOB schemefiles schemes/*.colors)
-install( FILES ${schemefiles} DESTINATION ${DATA_INSTALL_DIR}/color-schemes )
+install(
+    FILES
+    schemes/Honeycomb.colors
+    schemes/Norway.colors
+    schemes/ObsidianCoast.colors
+    schemes/OxygenCold.colors
+    schemes/Oxygen.colors
+    schemes/Steel.colors
+    schemes/WontonSoup.colors
+    schemes/Zion.colors
+    schemes/ZionReversed.colors
+    DESTINATION ${DATA_INSTALL_DIR}/color-schemes
+)
index d24db2f..eff41ef 100644 (file)
@@ -1,7 +1,8 @@
-
 add_executable(kde4-menu kde-menu.cpp)
 
 target_link_libraries(kde4-menu ${KDE4_KIO_LIBS})
 
-install(TARGETS kde4-menu ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
+install(
+    TARGETS kde4-menu
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
index ba0cb79..038978c 100644 (file)
@@ -1 +1,4 @@
-install(PROGRAMS kdeeject DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(
+    PROGRAMS kdeeject
+    DESTINATION ${LIBEXEC_INSTALL_DIR}
+)