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

List:       kde-commits
Subject:    [ksudoku/frameworks] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 12:09:21
Message-ID: E1aOOuX-000123-8F () scm ! kde ! org
[Download RAW message or body]

Git commit 4ec231cc65a39f8d36b48ac2f825c78d3d636d94 by Frederik Schwarzer.
Committed on 27/01/2016 at 12:09.
Pushed by schwarzer into branch 'frameworks'.

Use KCrash.

M  +15   -13   CMakeLists.txt
M  +19   -12   src/CMakeLists.txt
M  +3    -0    src/main.cpp

http://commits.kde.org/ksudoku/4ec231cc65a39f8d36b48ac2f825c78d3d636d94

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36410a4..6467f3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,27 +2,29 @@ project(ksudoku)
 =

 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 OpenGL)
-find_package(KF5 REQUIRED COMPONENTS =

-    CoreAddons
-    Config
-    ItemModels
-    WidgetsAddons
-    WindowSystem
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
+    ConfigWidgets
+    CoreAddons
+    Crash
     DBusAddons
     I18n
-    ConfigWidgets
-    TextWidgets
-    XmlGui
+    ItemModels
+    KDELibs4Support
     KIO
-    NotifyConfig
     NewStuff
-    KDELibs4Support)
+    NotifyConfig
+    TextWidgets
+    WidgetsAddons
+    WindowSystem
+    XmlGui
+)
 =

 find_package(KF5KDEGames 4.9.0 REQUIRED)
 =

@@ -59,8 +61,8 @@ if(OPENGL_SUPPORT)
 	add_definitions(-DOPENGL_SUPPORT)
 endif(OPENGL_SUPPORT)
 =

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

 #message(STATUS "ksudoku: DEBUG: ${DEBUG}")
 #message(STATUS "ksudoku: install prefix: ${CMAKE_INSTALL_PREFIX}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ba8cc9..4bd73d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,9 +26,12 @@ kde4_add_app_icon(ksudoku_SRCS "${KDE4_ICON_INSTALL_DIR}=
/oxygen/*/apps/ksudoku.p
 add_executable(ksudoku ${ksudoku_SRCS})
 =

 target_link_libraries(ksudoku
-	ksudoku_gui ksudoku_logic
-	KF5KDEGames KF5KDEGamesPrivate
-	KF5::KIOCore
+    ksudoku_gui
+    ksudoku_logic
+    KF5KDEGames
+    KF5KDEGamesPrivate
+    KF5::KIOCore
+    KF5::Crash
 )
 =

 if(OPENGL_SUPPORT)
@@ -40,10 +43,10 @@ endif(OPENGL_SUPPORT)
 install(TARGETS ksudoku  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 =

 ########### next target ###############
-add_subdirectory( gui )
-add_subdirectory( logic  )
-add_subdirectory( shapes )
-add_subdirectory( themes )
+add_subdirectory(gui)
+add_subdirectory(logic)
+add_subdirectory(shapes)
+add_subdirectory(themes)
 =

 =

 #set(ksudoku_client_SRCS
@@ -62,10 +65,14 @@ add_subdirectory( themes )
 =

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

-install( PROGRAMS gui/org.kde.ksudoku.desktop  DESTINATION  ${KDE_INSTALL_=
APPDIR} )
-install( FILES gui/ksudokuui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/k=
sudoku )
-install( FILES ksudokurc  DESTINATION ${KDE_INSTALL_CONFDIR})
-
-ecm_install_icons(ICONS hi128-apps-ksudoku.png  hi16-apps-ksudoku.png  hi3=
2-apps-ksudoku.png DESTINATION ${KDE_INSTALL_ICONDIR})
+install(PROGRAMS gui/org.kde.ksudoku.desktop  DESTINATION  ${KDE_INSTALL_A=
PPDIR})
+install(FILES gui/ksudokuui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/ks=
udoku)
+install(FILES ksudokurc  DESTINATION ${KDE_INSTALL_CONFDIR})
 =

+ecm_install_icons(ICONS
+    hi128-apps-ksudoku.png
+    hi16-apps-ksudoku.png
+    hi32-apps-ksudoku.png
+    DESTINATION ${KDE_INSTALL_ICONDIR}
+)
 =

diff --git a/src/main.cpp b/src/main.cpp
index 06dca5c..33a4197 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
 #include <kapplication.h>
 //#include <dcopclient.h>
 #include <K4AboutData>
+#include <KCrash>
 #include <kcmdlineargs.h>
 #include <KLocalizedString>
 #include <kconfigdialogmanager.h>
@@ -65,6 +66,8 @@ int main(int argc, char **argv)
 =

     KLocalizedString::setApplicationDomain("ksudoku");
 =

+    KCrash::initialize();
+
 	// register ourselves as a dcop client
 //	app.dcopClient()->registerAs(app.name(), false); //TODO PORT
 =09
[prev in list] [next in list] [prev in thread] [next in thread]