From b8e8d975aaa5eb9921a9f642c8a0a2d0dd4ac9fa Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Thu, 28 Aug 2014 12:05:00 +0200
Subject: [PATCH] Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake

---
 CMakeLists.txt                             | 15 +++++++++------
 OWNCLOUD.cmake                             |  3 +++
 src/crashreporter/CrashReporterConfig.h.in |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56c749a7eb..42d080307d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,15 @@ endif()
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 
+# disable the crashrepoter if libcrashreporter-qt is not available or we're building for ARM
+if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
+    set( WITH_CRASHREPORTER OFF )
+endif()
+
+if(NOT WITH_CRASHREPORTER)
+    message(STATUS "Build of crashreporter disabled.")
+endif()
+
 #####
 ## handle DBUS for Fdo notifications
 if( UNIX AND NOT APPLE )
@@ -94,12 +103,6 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
     add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()
 
-option(WITH_CRASHREPORTER "Build the crash reporter" ON)
-IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
-    message(STATUS "Build of crashreporter disabled.")
-    SET(WITH_CRASHREPORTER OFF)
-ENDIF()
-
 #### find libs
 #find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
 #if( UNIX AND NOT APPLE ) # Fdo notifications
diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake
index c17834c699..44edd3ded7 100644
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -10,3 +10,6 @@ set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
+
+option( WITH_CRASHREPORTER "Build crashreporter" OFF )
+set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.org/submit" CACHE string "URL for crash repoter" )
diff --git a/src/crashreporter/CrashReporterConfig.h.in b/src/crashreporter/CrashReporterConfig.h.in
index 3dcda4b78c..1fa026d5d2 100644
--- a/src/crashreporter/CrashReporterConfig.h.in
+++ b/src/crashreporter/CrashReporterConfig.h.in
@@ -9,6 +9,6 @@
 
 #define CRASHREPORTER_VERSION_STRING "@MIRALL_VERSION_STRING@"
 
-#define CRASHREPORTER_SUBMIT_URL "http://crash-reports.owncloud.org/submit"
+#define CRASHREPORTER_SUBMIT_URL "@CRASHREPORTER_SUBMIT_URL@"
 
 #endif // CRASHREPORTERCONFIG_H