[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [picmi] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 12:36:04
Message-ID: E1aOPKO-0001dm-2c () scm ! kde ! org
[Download RAW message or body]

Git commit e1da712f57a726770ee5778507b83093dfdcaac7 by Frederik Schwarzer.
Committed on 27/01/2016 at 12:36.
Pushed by schwarzer into branch 'master'.

Use KCrash.

M  +10   -6    CMakeLists.txt
M  +7    -6    src/CMakeLists.txt
M  +2    -0    src/main.cpp

http://commits.kde.org/picmi/e1da712f57a726770ee5778507b83093dfdcaac7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb49d29..09c2c9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
-cmake_minimum_required (VERSION 2.8.12)
 project (picmi)
 
+cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
+set (QT_MIN_VERSION "5.2.0")
+set (KF5_MIN_VERSION "5.15.0")
+
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif ()
@@ -9,10 +12,10 @@ endif ()
 find_package(ECM 1.7.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-find_package(Qt5 5.2.0 CONFIG REQUIRED Core Widgets Svg Quick QuickWidgets Test)
-find_package(KF5 REQUIRED COMPONENTS
-    DocTools
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Svg Quick QuickWidgets Test)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     CoreAddons
+    Crash
     DBusAddons
     Declarative
     DocTools
@@ -41,8 +44,9 @@ add_subdirectory(src)
 add_subdirectory(test)
 
 install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
+install(FILES ${CMAKE_SOURCE_DIR}/org.kde.picmi.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES ${CMAKE_SOURCE_DIR}/picmiui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/picmi)
 
-# vim:set ts=4 sw=4 et:
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+# vim:set ts=4 sw=4 et:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c66fcca..6971add 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ remove_definitions(-DQT_NO_STL)
 kde_enable_exceptions()
 
 if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_definitions("-Wextra -pedantic")
+    add_compile_options(-Wextra -pedantic)
 endif ()
 
 include(CheckIncludeFileCXX)
@@ -42,15 +42,16 @@ ecm_add_app_icon(picmi_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(picmi ${picmi_SRCS})
 target_link_libraries(picmi
-    picmi_gui
-    picmi_logic
+    Qt5::Svg
     KF5::CoreAddons
-    KF5::XmlGui
+    KF5::Crash
+    KF5::DBusAddons
     KF5::I18n
     KF5::KIOWidgets
-    Qt5::Svg
+    KF5::XmlGui
     KF5KDEGames
-    KF5::DBusAddons
+    picmi_gui
+    picmi_logic
 )
 
 install(TARGETS picmi DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/main.cpp b/src/main.cpp
index 3248dc5..37655f8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <KAboutData>
+#include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
 #include <QApplication>
@@ -52,6 +53,7 @@ int main(int argc, char *argv[])
 
     QCommandLineParser parser;
     KAboutData::setApplicationData(about);
+    KCrash::initialize();
     parser.addVersionOption();
     parser.addHelpOption();
     about.setupCommandLine(&parser);
[prev in list] [next in list] [prev in thread] [next in thread]