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

List:       kde-commits
Subject:    [kgoldrunner/frameworks] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 10:05:56
Message-ID: E1aOMz6-0007Gn-9C () scm ! kde ! org
[Download RAW message or body]

Git commit 3916b7941529893d6027127e6b079a8d857793b9 by Frederik Schwarzer.
Committed on 27/01/2016 at 10:05.
Pushed by schwarzer into branch 'frameworks'.

Use KCrash.

M  +7    -5    CMakeLists.txt
M  +21   -5    src/CMakeLists.txt
M  +2    -0    src/main.cpp

http://commits.kde.org/kgoldrunner/3916b7941529893d6027127e6b079a8d857793b9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec052a..aeb89c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,16 @@ project(kgoldrunner)
 =

 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 set (QT_MIN_VERSION "5.3.0")
+set (KF5_MIN_VERSION "5.15.0")
 =

 find_package(ECM 1.7.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MO=
DULE_DIR})
 =

 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Q=
ml Quick QuickWidgets Svg Test)
-find_package(KF5 REQUIRED COMPONENTS =

+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     CoreAddons
     Config
+    Crash
     ItemModels
     WidgetsAddons
     WindowSystem
@@ -38,9 +40,9 @@ include(ECMAddAppIcon)
 =

 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 =

-add_subdirectory( src ) =

-add_subdirectory( gamedata ) =

-add_subdirectory( themes ) =

-add_subdirectory( doc )
+add_subdirectory(src)
+add_subdirectory(gamedata)
+add_subdirectory(themes)
+add_subdirectory(doc)
 =

 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_=
PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7381c06..34ce589 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,19 +20,35 @@ set(kgoldrunner_SRCS
    main.cpp =

    kgrselector.cpp
    kgrsounds.cpp =

-   kgrdialog.cpp )
+   kgrdialog.cpp
+)
 =

 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kgoldrunner.png")
 ecm_add_app_icon(kgoldrunner_SRCS ICONS ${ICONS_SRCS})
 add_executable(kgoldrunner ${kgoldrunner_SRCS})
 =

-target_link_libraries(kgoldrunner  KF5KDEGames KF5KDEGamesPrivate KF5::KDE=
Libs4Support KF5::DBusAddons)
+target_link_libraries(kgoldrunner
+    KF5KDEGames
+    KF5KDEGamesPrivate
+    KF5::KDELibs4Support
+    KF5::DBusAddons
+    KF5::Crash
+)
 =

 install(TARGETS kgoldrunner  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 =

 ########### install files ###############
 =

-install( PROGRAMS org.kde.KGoldrunner.desktop  DESTINATION  ${KDE_INSTALL_=
APPDIR} )
-install( FILES kgoldrunnerui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/k=
goldrunner )
+install(PROGRAMS org.kde.KGoldrunner.desktop  DESTINATION  ${KDE_INSTALL_A=
PPDIR})
+install(FILES kgoldrunnerui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kg=
oldrunner)
+
+ecm_install_icons(ICONS
+    128-apps-kgoldrunner.png
+    16-apps-kgoldrunner.png
+    22-apps-kgoldrunner.png
+    32-apps-kgoldrunner.png
+    48-apps-kgoldrunner.png
+    64-apps-kgoldrunner.png
+    DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor
+)
 =

-ecm_install_icons( ICONS 128-apps-kgoldrunner.png  16-apps-kgoldrunner.png=
  22-apps-kgoldrunner.png  32-apps-kgoldrunner.png  48-apps-kgoldrunner.png=
  64-apps-kgoldrunner.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
diff --git a/src/main.cpp b/src/main.cpp
index b5591b7..fe85231 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,7 @@
 #include "kgoldrunner_debug.h"
 =

 #include <KAboutData>
+#include <KCrash>
 =

 #include <KLocalizedString>
 #include <QApplication>
@@ -57,6 +58,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]