Use system libcrashreporter

owncloud · Feb 21, 2023 · 1c3d624 · 1c3d624
1 parent 2ec02f2
commit 1c3d624
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/3rdparty/libcrashreporter-qt"]
-	path = src/3rdparty/libcrashreporter-qt
-	url = https://github.com/dschmidt/libcrashreporter-qt.git

diff --git a/src/3rdparty/libcrashreporter-qt b/src/3rdparty/libcrashreporter-qt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,6 +2,9 @@ find_package(Qt5 5.15 COMPONENTS Core Concurrent Network Widgets Xml REQUIRED)
 get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
 message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})")
 
+if(WITH_CRASHREPORTER)
+    find_package(CrashReporterQt REQUIRED)
+endif()
 
 find_package(Qt5Keychain REQUIRED)
 
@@ -45,7 +48,6 @@ if (NOT BUILD_LIBRARIES_ONLY)
     add_subdirectory(cmd)
 
     if (WITH_CRASHREPORTER)
-        add_subdirectory(3rdparty/libcrashreporter-qt EXCLUDE_FROM_ALL)
         add_subdirectory(crashreporter)
     endif()
 endif(NOT BUILD_LIBRARIES_ONLY)

diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
@@ -51,8 +51,10 @@ if(NOT BUILD_LIBRARIES_ONLY)
 
     target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
     target_link_libraries(${CRASHREPORTER_EXECUTABLE}
-        crashreporter-gui
-        Qt5::Core Qt5::Widgets
+        PRIVATE
+            CrashReporterQt::Gui
+            Qt5::Core
+            Qt5::Widgets
     )
 
     if(APPLE)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -168,7 +168,7 @@ endif()
 
 
 if(WITH_CRASHREPORTER)
-    target_link_libraries(owncloudCore PUBLIC crashreporter-handler)
+    target_link_libraries(owncloudCore PRIVATE CrashReporterQt::Handler)
 
     if(UNIX AND NOT MAC)
         find_package(Threads REQUIRED)