crashpad: updated crash handler

2020-09-22 18:42:51 +10:00
parent 871bc08c12
commit cd47676043
11 changed files with 298 additions and 285 deletions
@@ -183,6 +183,54 @@ if (GoogleCrashpad_FOUND)
    PRIVATE
    ${CRASHPAD_LIBRARIES}
    )
+
+  set(OLIVE_CRASH_TARGET "olive-crashhandler")
+
+  set(OLIVE_CRASH_SOURCES
+    dialog/crashhandler/crashhandler.h
+    dialog/crashhandler/crashhandler.cpp
+    dialog/crashhandler/crashhandlermain.cpp
+  )
+
+  if (WIN32)
+    add_executable(
+      ${OLIVE_CRASH_TARGET}
+      WIN32
+      ${OLIVE_CRASH_SOURCES}
+    )
+  else()
+    add_executable(
+      ${OLIVE_CRASH_TARGET}
+      ${OLIVE_CRASH_SOURCES}
+    )
+  endif()
+
+  target_include_directories(
+    ${OLIVE_CRASH_TARGET}
+    PRIVATE
+    ${CRASHPAD_INCLUDE_DIRS}
+    )
+
+  target_link_libraries(
+    ${OLIVE_CRASH_TARGET}
+    PRIVATE
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets
+    Qt5::Network
+    ${CRASHPAD_LIBRARIES}
+  )
+
+  if(UNIX AND NOT APPLE)
+    install(TARGETS ${OLIVE_TARGET} ${OLIVE_CRASH_TARGET} RUNTIME DESTINATION bin)
+  endif()
+
+  if(APPLE)
+    # Move crash handler program inside Mac app bundle
+    add_custom_command(TARGET ${OLIVE_CRASH_TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy ${OLIVE_CRASH_TARGET} $<TARGET_FILE_DIR:${OLIVE_TARGET}>
+    )
+  endif()
 endif()

 # Set compiler definitions
@@ -207,43 +255,3 @@ if(DOXYGEN_FOUND)
  set(DOXYGEN_EXTRACT_PRIVATE "YES")
  doxygen_add_docs(docs ALL ${OLIVE_SOURCES})
 endif()
-
-set(OLIVE_CRASH_TARGET "olive-crashhandler")
-
-set(OLIVE_CRASH_SOURCES
-  dialog/crashhandler/crashhandler.h
-  dialog/crashhandler/crashhandler.cpp
-  dialog/crashhandler/crashhandlermain.cpp
-)
-
-if (WIN32)
-  add_executable(
-    ${OLIVE_CRASH_TARGET}
-    WIN32
-    ${OLIVE_CRASH_SOURCES}
-  )
-else()
-  add_executable(
-    ${OLIVE_CRASH_TARGET}
-    ${OLIVE_CRASH_SOURCES}
-  )
-endif()
-
-target_link_libraries(
-  ${OLIVE_CRASH_TARGET}
-  PRIVATE
-  Qt5::Core
-  Qt5::Gui
-  Qt5::Widgets
-)
-
-if(UNIX AND NOT APPLE)
-  install(TARGETS ${OLIVE_TARGET} ${OLIVE_CRASH_TARGET} RUNTIME DESTINATION bin)
-endif()
-
-if(APPLE)
-  # Move crash handler program inside Mac app bundle
-  add_custom_command(TARGET ${OLIVE_CRASH_TARGET} POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${OLIVE_CRASH_TARGET} $<TARGET_FILE_DIR:${OLIVE_TARGET}>
-  )
-endif()