From: Ivailo Monev Date: Wed, 5 Feb 2020 02:36:56 +0000 (+0200) Subject: ksystemlog: rework build system to fix some bugs X-Git-Tag: 4.22.0~746 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=803e130853b6364b45f96c8da9121a1b56c8cd94;p=kde%2Fkde-extraapps.git ksystemlog: rework build system to fix some bugs it fixes build with LTO and removes the need to workaround CMake automatic UIC logic --- diff --git a/ksystemlog/CMakeLists.txt b/ksystemlog/CMakeLists.txt index 66426cd6..eb3e118f 100644 --- a/ksystemlog/CMakeLists.txt +++ b/ksystemlog/CMakeLists.txt @@ -1,5 +1,14 @@ project(KSystemLog) +project(ark) + +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(CheckIncludeFile) include(CheckIncludeFiles) include(CheckSymbolExists) @@ -7,29 +16,9 @@ include(CheckFunctionExists) include(CheckLibraryExists) include(CheckTypeSize) -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) - ########### Subfolders ########## add_subdirectory(src) -add_subdirectory(src/lib) -add_subdirectory(src/config) - -add_subdirectory(src/modes/base) -add_subdirectory(src/modes/open) -add_subdirectory(src/modes/system) -add_subdirectory(src/modes/kernel) -add_subdirectory(src/modes/xorg) -add_subdirectory(src/modes/cron) -add_subdirectory(src/modes/authentication) -add_subdirectory(src/modes/daemon) -add_subdirectory(src/modes/acpid) -add_subdirectory(src/modes/xsession) -add_subdirectory(src/modes/apache) -add_subdirectory(src/modes/postfix) -add_subdirectory(src/modes/samba) -add_subdirectory(src/modes/cups) if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/ksystemlog/src/CMakeLists.txt b/ksystemlog/src/CMakeLists.txt index 9b8e60e8..06b494a7 100644 --- a/ksystemlog/src/CMakeLists.txt +++ b/ksystemlog/src/CMakeLists.txt @@ -2,29 +2,151 @@ ########### Build ############### include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/config ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${CMAKE_CURRENT_BINARY_DIR}/config ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/modes/open - - ${CMAKE_CURRENT_SOURCE_DIR}/modes/system - ${CMAKE_CURRENT_SOURCE_DIR}/modes/kernel - ${CMAKE_CURRENT_SOURCE_DIR}/modes/daemon - ${CMAKE_CURRENT_SOURCE_DIR}/modes/xorg - ${CMAKE_CURRENT_SOURCE_DIR}/modes/cron ${CMAKE_CURRENT_SOURCE_DIR}/modes/acpid - ${CMAKE_CURRENT_SOURCE_DIR}/modes/xsession ${CMAKE_CURRENT_SOURCE_DIR}/modes/apache + ${CMAKE_CURRENT_SOURCE_DIR}/modes/authentication + ${CMAKE_CURRENT_SOURCE_DIR}/modes/base + ${CMAKE_CURRENT_SOURCE_DIR}/modes/cron ${CMAKE_CURRENT_SOURCE_DIR}/modes/cups + ${CMAKE_CURRENT_SOURCE_DIR}/modes/daemon + ${CMAKE_CURRENT_SOURCE_DIR}/modes/kernel + ${CMAKE_CURRENT_SOURCE_DIR}/modes/open + ${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix ${CMAKE_CURRENT_SOURCE_DIR}/modes/samba - ${CMAKE_CURRENT_SOURCE_DIR}/modes/authentication - ${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix + ${CMAKE_CURRENT_SOURCE_DIR}/modes/system + ${CMAKE_CURRENT_SOURCE_DIR}/modes/xorg + ${CMAKE_CURRENT_SOURCE_DIR}/modes/xsession +) + +set(ksystemlog_library_sources + lib/analyzer.cpp + lib/logModeFactory.cpp + lib/logModeConfiguration.cpp + lib/logModeConfigurationWidget.cpp + lib/logModeItemBuilder.cpp + lib/logManager.cpp + lib/view.cpp + lib/globals.cpp + lib/logMode.cpp + lib/logLevel.cpp + lib/logFile.cpp + lib/logFileReader.cpp + lib/localLogFileReader.cpp + lib/processOutputLogFileReader.cpp + lib/kioLogFileReader.cpp + lib/logLine.cpp + lib/logViewModel.cpp + lib/logViewColumn.cpp + lib/logViewColumns.cpp + lib/logViewWidgetItem.cpp + lib/logViewWidget.cpp + lib/logViewExport.cpp + lib/logViewFilterWidget.cpp + lib/logViewSearchWidget.cpp + lib/loadingBar.cpp + lib/logModeAction.cpp + lib/simpleAction.cpp + lib/multipleActions.cpp + lib/levelPrintPage.cpp + + modes/base/parsingHelper.cpp + modes/base/fileList.cpp + modes/base/logLevelFileList.cpp + modes/base/multipleFileList.cpp + modes/base/fileListHelper.cpp + modes/base/logLevelSelectionDialog.cpp + modes/base/genericConfiguration.cpp + modes/base/syslogAnalyzer.cpp + modes/kernel/kernelFactory.cpp + modes/kernel/kernelAnalyzer.cpp + modes/kernel/kernelLogMode.cpp + modes/kernel/kernelItemBuilder.cpp + modes/system/systemFactory.cpp + modes/system/systemConfigurationWidget.cpp + modes/system/systemConfiguration.cpp + modes/system/systemAnalyzer.cpp + modes/system/systemLogMode.cpp ) set(ksystemlog_sources + modes/acpid/acpidConfigurationWidget.cpp + modes/acpid/acpidConfiguration.cpp + modes/acpid/acpidAnalyzer.cpp + modes/acpid/acpidItemBuilder.cpp + modes/acpid/acpidLogMode.cpp + modes/acpid/acpidFactory.cpp + modes/apache/apacheConfiguration.cpp + modes/apache/apacheConfigurationWidget.cpp + modes/apache/apacheAnalyzer.cpp + modes/apache/apacheItemBuilder.cpp + modes/apache/apacheAccessAnalyzer.cpp + modes/apache/apacheAccessItemBuilder.cpp + modes/apache/apacheFactory.cpp + modes/apache/apacheLogMode.cpp + modes/apache/apacheAccessLogMode.cpp + modes/authentication/authenticationConfigurationWidget.cpp + modes/authentication/authenticationConfiguration.cpp + modes/authentication/authenticationAnalyzer.cpp + modes/authentication/authenticationLogMode.cpp + modes/authentication/authenticationFactory.cpp + modes/cron/cronConfigurationWidget.cpp + modes/cron/cronConfiguration.cpp + modes/cron/cronAnalyzer.cpp + modes/cron/cronItemBuilder.cpp + modes/cron/cronLogMode.cpp + modes/cron/cronFactory.cpp + modes/cups/cupsConfiguration.cpp + modes/cups/cupsConfigurationWidget.cpp + modes/cups/cupsAnalyzer.cpp + modes/cups/cupsItemBuilder.cpp + modes/cups/cupsLogMode.cpp + modes/cups/cupsAccessAnalyzer.cpp + modes/cups/cupsAccessItemBuilder.cpp + modes/cups/cupsAccessLogMode.cpp + modes/cups/cupsPageAnalyzer.cpp + modes/cups/cupsPageItemBuilder.cpp + modes/cups/cupsPageLogMode.cpp + modes/cups/cupsPdfAnalyzer.cpp + modes/cups/cupsPdfItemBuilder.cpp + modes/cups/cupsPdfLogMode.cpp + modes/cups/cupsFactory.cpp + modes/daemon/daemonConfigurationWidget.cpp + modes/daemon/daemonConfiguration.cpp + modes/daemon/daemonLogMode.cpp + modes/daemon/daemonFactory.cpp + modes/open/openAnalyzer.cpp + modes/open/openFactory.cpp + modes/open/openLogMode.cpp + modes/postfix/postfixFactory.cpp + modes/postfix/postfixConfigurationWidget.cpp + modes/postfix/postfixConfiguration.cpp + modes/postfix/postfixAnalyzer.cpp + modes/postfix/postfixLogMode.cpp + modes/samba/sambaConfiguration.cpp + modes/samba/sambaConfigurationWidget.cpp + modes/samba/sambaAnalyzer.cpp + modes/samba/sambaLogMode.cpp + modes/samba/sambaItemBuilder.cpp + modes/samba/sambaAccessLogMode.cpp + modes/samba/netbiosLogMode.cpp + modes/samba/sambaFactory.cpp + modes/xorg/xorgConfigurationWidget.cpp + modes/xorg/xorgConfiguration.cpp + modes/xorg/xorgAnalyzer.cpp + modes/xorg/xorgItemBuilder.cpp + modes/xorg/xorgLogMode.cpp + modes/xorg/xorgFactory.cpp + modes/xsession/xsessionConfigurationWidget.cpp + modes/xsession/xsessionConfiguration.cpp + modes/xsession/xsessionAnalyzer.cpp + modes/xsession/xsessionItemBuilder.cpp + modes/xsession/xsessionLogMode.cpp + modes/xsession/xsessionFactory.cpp + main.cpp mainWindow.cpp logModePluginsLoader.cpp @@ -37,31 +159,22 @@ set(ksystemlog_sources statusBar.cpp ) -add_executable(ksystemlog ${ksystemlog_sources}) +kde4_add_kcfg_files(ksystemlog_library_sources ksystemlogConfig.kcfgc) + +add_executable(ksystemlog ${ksystemlog_library_sources} ${ksystemlog_sources}) target_link_libraries(ksystemlog ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_config - ksystemlog_open - ksystemlog_system - ksystemlog_kernel - ksystemlog_xorg - ksystemlog_cron - ksystemlog_apache - ksystemlog_authentication - ksystemlog_daemon - ksystemlog_acpid - ksystemlog_xsession - ksystemlog_postfix - ksystemlog_cups - ksystemlog_samba ) +if(ENABLE_TESTING) + add_library(ksystemlog_library SHARED ${ksystemlog_library_sources}) +endif() + ########### Installation ############### -install( TARGETS ksystemlog ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS ksystemlog ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS ksystemlog.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES ksystemlogui.rc DESTINATION ${DATA_INSTALL_DIR}/ksystemlog) +install(PROGRAMS ksystemlog.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES ksystemlogui.rc DESTINATION ${DATA_INSTALL_DIR}/ksystemlog) diff --git a/ksystemlog/src/config/CMakeLists.txt b/ksystemlog/src/config/CMakeLists.txt deleted file mode 100644 index 550c54d0..00000000 --- a/ksystemlog/src/config/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories( - ${KDE4_INCLUDE_DIR} - ${QT_INCLUDES} -) - -set(ksystemlog_config_SRCS - dummyConfig.cpp -) - -kde4_add_kcfg_files(ksystemlog_config_SRCS ksystemlogConfig.kcfgc) - -add_library(ksystemlog_config STATIC ${ksystemlog_config_SRCS}) - -target_link_libraries(ksystemlog_config - ${KDE4_KDEUI_LIBS} -) diff --git a/ksystemlog/src/config/dummyConfig.cpp b/ksystemlog/src/config/dummyConfig.cpp deleted file mode 100644 index e103ea6f..00000000 --- a/ksystemlog/src/config/dummyConfig.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/*************************************************************************** - * KSystemLog, a system log viewer tool * - * Copyright (C) 2007 by Nicolas Ternisien * - * nicolas.ternisien@gmail.com * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ diff --git a/ksystemlog/src/config/ksystemlog.kcfg b/ksystemlog/src/ksystemlog.kcfg similarity index 100% rename from ksystemlog/src/config/ksystemlog.kcfg rename to ksystemlog/src/ksystemlog.kcfg diff --git a/ksystemlog/src/config/ksystemlogConfig.kcfgc b/ksystemlog/src/ksystemlogConfig.kcfgc similarity index 100% rename from ksystemlog/src/config/ksystemlogConfig.kcfgc rename to ksystemlog/src/ksystemlogConfig.kcfgc diff --git a/ksystemlog/src/modes/acpid/CMakeLists.txt b/ksystemlog/src/modes/acpid/CMakeLists.txt deleted file mode 100644 index 46131069..00000000 --- a/ksystemlog/src/modes/acpid/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_acpid_sources - acpidConfigurationWidget.cpp - acpidConfiguration.cpp - acpidAnalyzer.cpp - acpidItemBuilder.cpp - acpidLogMode.cpp - acpidFactory.cpp -) - -add_library(ksystemlog_acpid STATIC ${ksystemlog_acpid_sources}) - -add_dependencies( - ksystemlog_acpid - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_acpid - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/apache/CMakeLists.txt b/ksystemlog/src/modes/apache/CMakeLists.txt deleted file mode 100644 index a9906215..00000000 --- a/ksystemlog/src/modes/apache/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base -) - -set(ksystemlog_apache_sources - apacheConfiguration.cpp - apacheConfigurationWidget.cpp - apacheAnalyzer.cpp - apacheItemBuilder.cpp - apacheAccessAnalyzer.cpp - apacheAccessItemBuilder.cpp - apacheFactory.cpp - apacheLogMode.cpp - apacheAccessLogMode.cpp -) - -add_library(ksystemlog_apache STATIC ${ksystemlog_apache_sources}) - -add_dependencies( - ksystemlog_apache - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_apache - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/authentication/CMakeLists.txt b/ksystemlog/src/modes/authentication/CMakeLists.txt deleted file mode 100644 index b908db56..00000000 --- a/ksystemlog/src/modes/authentication/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_authentication_sources - authenticationConfigurationWidget.cpp - authenticationConfiguration.cpp - authenticationAnalyzer.cpp - authenticationLogMode.cpp - authenticationFactory.cpp -) - -add_library(ksystemlog_authentication STATIC ${ksystemlog_authentication_sources}) - -add_dependencies( - ksystemlog_authentication - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_authentication - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/base/CMakeLists.txt b/ksystemlog/src/modes/base/CMakeLists.txt deleted file mode 100644 index 999a8f4e..00000000 --- a/ksystemlog/src/modes/base/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_base_mode_sources - parsingHelper.cpp - fileList.cpp - logLevelFileList.cpp - multipleFileList.cpp - fileListHelper.cpp - logLevelSelectionDialog.cpp - genericConfiguration.cpp - syslogAnalyzer.cpp -) - -# avoid putting the generated files in target specific -# directory which is the case when automated -set(CMAKE_AUTOUIC OFF) - -qt4_wrap_ui(ksystemlog_base_mode_sources - fileListBase.ui - multipleFileListBase.ui - logLevelSelectionDialogBase.ui -) - -add_library(ksystemlog_base_mode STATIC ${ksystemlog_base_mode_sources}) - -add_dependencies( - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_base_mode - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_config -) diff --git a/ksystemlog/src/modes/cron/CMakeLists.txt b/ksystemlog/src/modes/cron/CMakeLists.txt deleted file mode 100644 index 1ba77375..00000000 --- a/ksystemlog/src/modes/cron/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_cron_sources - cronConfigurationWidget.cpp - cronConfiguration.cpp - cronAnalyzer.cpp - cronItemBuilder.cpp - cronLogMode.cpp - cronFactory.cpp -) - -add_library(ksystemlog_cron STATIC ${ksystemlog_cron_sources}) - -add_dependencies( - ksystemlog_cron - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_cron - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/cups/CMakeLists.txt b/ksystemlog/src/modes/cups/CMakeLists.txt deleted file mode 100644 index c750cb24..00000000 --- a/ksystemlog/src/modes/cups/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_cups_sources - cupsConfiguration.cpp - cupsConfigurationWidget.cpp - - cupsAnalyzer.cpp - cupsItemBuilder.cpp - cupsLogMode.cpp - - cupsAccessAnalyzer.cpp - cupsAccessItemBuilder.cpp - cupsAccessLogMode.cpp - - cupsPageAnalyzer.cpp - cupsPageItemBuilder.cpp - cupsPageLogMode.cpp - - cupsPdfAnalyzer.cpp - cupsPdfItemBuilder.cpp - cupsPdfLogMode.cpp - - cupsFactory.cpp - -) - -add_library(ksystemlog_cups STATIC ${ksystemlog_cups_sources}) - -add_dependencies( - ksystemlog_cups - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_cups - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/daemon/CMakeLists.txt b/ksystemlog/src/modes/daemon/CMakeLists.txt deleted file mode 100644 index 60f3a532..00000000 --- a/ksystemlog/src/modes/daemon/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_daemon_sources - daemonConfigurationWidget.cpp - daemonConfiguration.cpp - daemonLogMode.cpp - daemonFactory.cpp -) - -add_library(ksystemlog_daemon STATIC ${ksystemlog_daemon_sources}) - -add_dependencies( - ksystemlog_daemon - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_daemon - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/kernel/CMakeLists.txt b/ksystemlog/src/modes/kernel/CMakeLists.txt deleted file mode 100644 index d69332af..00000000 --- a/ksystemlog/src/modes/kernel/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_SOURCE_DIR}/../base -) - -set(ksystemlog_kernel_sources - kernelFactory.cpp - kernelAnalyzer.cpp - kernelLogMode.cpp - kernelItemBuilder.cpp -) - -add_library(ksystemlog_kernel STATIC ${ksystemlog_kernel_sources}) - -add_dependencies( - ksystemlog_kernel - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_kernel - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/open/CMakeLists.txt b/ksystemlog/src/modes/open/CMakeLists.txt deleted file mode 100644 index 0a64438d..00000000 --- a/ksystemlog/src/modes/open/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_open_sources - openAnalyzer.cpp - openFactory.cpp - openLogMode.cpp -) - - -add_library(ksystemlog_open STATIC ${ksystemlog_open_sources}) - -add_dependencies( - ksystemlog_open - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_open - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_config - ksystemlog_base_mode -) diff --git a/ksystemlog/src/modes/postfix/CMakeLists.txt b/ksystemlog/src/modes/postfix/CMakeLists.txt deleted file mode 100644 index d2d861f7..00000000 --- a/ksystemlog/src/modes/postfix/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base -) - -set(ksystemlog_postfix_sources - postfixFactory.cpp - postfixConfigurationWidget.cpp - postfixConfiguration.cpp - postfixAnalyzer.cpp - postfixLogMode.cpp -) - -add_library(ksystemlog_postfix STATIC ${ksystemlog_postfix_sources}) - -add_dependencies( - ksystemlog_postfix - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_postfix - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/samba/CMakeLists.txt b/ksystemlog/src/modes/samba/CMakeLists.txt deleted file mode 100644 index e7b6045c..00000000 --- a/ksystemlog/src/modes/samba/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base -) - -set(ksystemlog_samba_sources - sambaConfiguration.cpp - sambaConfigurationWidget.cpp - sambaAnalyzer.cpp - sambaLogMode.cpp - sambaItemBuilder.cpp - sambaAccessLogMode.cpp - netbiosLogMode.cpp - sambaFactory.cpp - -) - -add_library(ksystemlog_samba STATIC ${ksystemlog_samba_sources}) - -add_dependencies( - ksystemlog_samba - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_samba - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/system/CMakeLists.txt b/ksystemlog/src/modes/system/CMakeLists.txt deleted file mode 100644 index 9db11393..00000000 --- a/ksystemlog/src/modes/system/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_BINARY_DIR}/../../config - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../base -) - -set(ksystemlog_system_sources - systemFactory.cpp - systemConfigurationWidget.cpp - systemConfiguration.cpp - systemAnalyzer.cpp - systemLogMode.cpp -) - -add_library(ksystemlog_system STATIC ${ksystemlog_system_sources}) - -add_dependencies( - ksystemlog_system - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_system - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/xorg/CMakeLists.txt b/ksystemlog/src/modes/xorg/CMakeLists.txt deleted file mode 100644 index 80cc820f..00000000 --- a/ksystemlog/src/modes/xorg/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_xorg_sources - xorgConfigurationWidget.cpp - xorgConfiguration.cpp - xorgAnalyzer.cpp - xorgItemBuilder.cpp - xorgLogMode.cpp - xorgFactory.cpp -) - -add_library(ksystemlog_xorg STATIC ${ksystemlog_xorg_sources}) - -add_dependencies( - ksystemlog_xorg - - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_xorg - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/src/modes/xsession/CMakeLists.txt b/ksystemlog/src/modes/xsession/CMakeLists.txt deleted file mode 100644 index a52414a6..00000000 --- a/ksystemlog/src/modes/xsession/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../base - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${CMAKE_CURRENT_SOURCE_DIR}/../../config - ${CMAKE_CURRENT_BINARY_DIR}/../base - ${CMAKE_CURRENT_BINARY_DIR}/../../config -) - -set(ksystemlog_xsession_sources - xsessionConfigurationWidget.cpp - xsessionConfiguration.cpp - xsessionAnalyzer.cpp - xsessionItemBuilder.cpp - xsessionLogMode.cpp - xsessionFactory.cpp - xsessionConfigurationWidgetBase.ui -) - -add_library(ksystemlog_xsession STATIC ${ksystemlog_xsession_sources}) - -add_dependencies( - ksystemlog_xsession - ksystemlog_base_mode - ksystemlog_lib -) - -target_link_libraries( - ksystemlog_xsession - ${KDE4_KDEUI_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config -) diff --git a/ksystemlog/tests/CMakeLists.txt b/ksystemlog/tests/CMakeLists.txt index 5e31a1cf..c6faeb2a 100644 --- a/ksystemlog/tests/CMakeLists.txt +++ b/ksystemlog/tests/CMakeLists.txt @@ -1,11 +1,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../src - ${CMAKE_CURRENT_SOURCE_DIR}/../src/config - ${CMAKE_CURRENT_BINARY_DIR}/../src/config - ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib - ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/system - ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/kernel + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_BINARY_DIR}/src + ${CMAKE_SOURCE_DIR}/src/lib + ${CMAKE_SOURCE_DIR}/src/modes/system + ${CMAKE_SOURCE_DIR}/src/modes/kernel ) macro(ksystemlog_unit_tests) @@ -15,21 +14,16 @@ macro(ksystemlog_unit_tests) testUtil.cpp ) - qt4_add_resources( unitTest_sources testResources.qrc ) + qt4_add_resources(unitTest_sources testResources.qrc) kde4_add_test(ksystemlog-${unitTest} ${unitTest_sources}) target_link_libraries(ksystemlog-${unitTest} - ${QT_AND_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} - ksystemlog_lib - ksystemlog_base_mode - ksystemlog_config - ksystemlog_system - ksystemlog_kernel + ksystemlog_library ) endforeach(unitTest) endmacro(ksystemlog_unit_tests)