ScopyApplication: Added BREAKPAD_HANDLER build option

To disable breakpad on systems that don't fully support it

Signed-off-by: Adrian Suciu <[email protected]>

CMakeLists.txt

@@ -80,11 +80,15 @@ if (NOT "${OUT_CONSTEXPR}" STREQUAL "-1")
 	add_definitions(-DHAS_CONSTEXPR=1)
 endif()
 
-find_library(BREAKPAD_LIBRARIES NAMES breakpad)
-find_library(BREAKPADCLIENT_LIBRARIES NAMES breakpad_client)
-
-find_path(BREAKPAD_INCLUDE_DIRS breakpad)
 
+option(BREAKPAD_HANDLER "Build with breakpad exception handler " ON)
+set(BREAKPAD_HANDLER_BOOL 0)
+if (BREAKPAD_HANDLER)
+	set(BREAKPAD_HANDLER_BOOL 1)
+	find_library(BREAKPAD_LIBRARIES NAMES breakpad)
+	find_library(BREAKPADCLIENT_LIBRARIES NAMES breakpad_client)
+	find_path(BREAKPAD_INCLUDE_DIRS breakpad)
+endif()
 
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Concurrent REQUIRED)

config.h.cmakein

@@ -3,5 +3,6 @@
 
 #define PROJECT_VERSION	       "@PROJECT_VERSION@"
 #define SCOPY_VERSION_GIT      "@SCOPY_VERSION_GIT@"
+#define BREAKPAD_HANDLER       @BREAKPAD_HANDLER_BOOL@
 
 #endif // CONFIG_H_CMAKEIN

src/main.cpp

@@ -33,6 +33,7 @@ using namespace adiscope;
 
 int main(int argc, char **argv)
 {
+#if BREAKPAD_HANDLER
 #ifdef Q_OS_LINUX
 	google_breakpad::MinidumpDescriptor descriptor("/tmp");
 	google_breakpad::ExceptionHandler eh(descriptor, NULL, ScopyApplication::dumpCallback, NULL, true, -1);
@@ -51,6 +52,9 @@ int main(int argc, char **argv)
 
 	ScopyApplication app(argc, argv);
 	app.setExceptionHandler(&eh);
+#else
+	QApplication app(argc, argv);
+#endif
 
 	QFont font("Open Sans");
 	app.setFont(font);
@@ -78,7 +82,12 @@ int main(int argc, char **argv)
 	QString fn("Scopy.ini");
 	path.chop(fn.length());
 
+#if BREAKPAD_HANDLER
 	QString prevCrashDump = app.initBreakPadHandler(path);
+#else
+	QString prevCrashDump = "";
+#endif
+
 
 	QCommandLineParser parser;
 

src/scopyApplication.cpp

@@ -1,10 +1,12 @@
 #include <QApplication>
 #include "scopyApplication.hpp"
+
 #include <QDir>
 #include <QFileInfo>
 #include <QDateTime>
 #include <QDebug>
 
+#if BREAKPAD_HANDLER
 using namespace google_breakpad;
 
 ScopyApplication::ScopyApplication(int& argc, char** argv) : QApplication(argc, argv) {}
@@ -92,5 +94,5 @@ bool ScopyApplication::dumpCallback(const google_breakpad::MinidumpDescriptor& d
 	return succeeded;
 }
 #endif
-
+#endif
 

src/scopyApplication.hpp

@@ -2,8 +2,11 @@
 #define SCOPYAPPLICATION_H
 
 #include <QtGlobal>
+#include "config.h"
 
 #define __STDC_FORMAT_MACROS
+
+#if BREAKPAD_HANDLER
 #ifdef Q_OS_WIN
 #include "breakpad/client/windows/handler/exception_handler.h"
 #endif
@@ -48,3 +51,4 @@ class ScopyApplication final : public QApplication {
 #endif
 };
 #endif
+#endif