Make crash reporter executable branded

CMakeLists.txt

@@ -19,6 +19,10 @@ if (NOT DEFINED APPLICATION_SHORTNAME)
      set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
 endif()
 
+if(NOT CRASHREPORTER_EXECUTABLE)
+    set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
+endif()
+
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 

config.h.in

@@ -4,6 +4,8 @@
 #cmakedefine USE_INOTIFY 1
 #cmakedefine WITH_QTKEYCHAIN 1
 #cmakedefine WITH_CRASHREPORTER
+#cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
+
 
 #cmakedefine GIT_SHA1 "@GIT_SHA1@"
 #cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@

src/crashreporter/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
     "../3rdparty/libcrashreporter-qt/src/"
 )
 
-add_executable( owncloud_crash_reporter WIN32
+add_executable( ${CRASHREPORTER_EXECUTABLE} WIN32
     ${crashreporter_SOURCES}
     ${crashreporter_HEADERS_MOC}
     ${crashreporter_UI_HEADERS}
@@ -31,14 +31,14 @@ add_executable( owncloud_crash_reporter WIN32
 )
 
 
-target_link_libraries(owncloud_crash_reporter
+target_link_libraries( ${CRASHREPORTER_EXECUTABLE}
     crashreporter-gui
     ${QT_LIBRARIES}
 )
 
 #TODO: don't use automoc :-(
-set_target_properties(owncloud_crash_reporter PROPERTIES AUTOMOC ON)
-set_target_properties(owncloud_crash_reporter PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
-install(TARGETS owncloud_crash_reporter RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
+set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
+set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
+install(TARGETS ${CRASHREPORTER_EXECUTABLE} RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 
-qt5_use_modules(owncloud_crash_reporter Widgets Network)
+qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network)

src/gui/main.cpp

@@ -28,6 +28,8 @@
 
 #include "updater/updater.h"
 
+
+#include "config.h"
 #ifdef WITH_CRASHREPORTER
     #include "mirallconfigfile.h"
     #include <libcrashreporter-handler/Handler.h>
@@ -59,7 +61,7 @@ int main(int argc, char **argv)
 
 
 #ifdef WITH_CRASHREPORTER
-    CrashReporter::Handler* handler = new CrashReporter::Handler( QDir::tempPath(), true, "owncloud_crash_reporter" );
+    CrashReporter::Handler* handler = new CrashReporter::Handler( QDir::tempPath(), true, CRASHREPORTER_EXECUTABLE );
     MirallConfigFile cfgFile;
     handler->setActive(cfgFile.crashReporter());
 #endif