Merge pull request #16 from Atlante45/interface-backtrace

Move crashpad out of shared

cmake/macros/AddCrashpad.cmake

@@ -10,8 +10,6 @@
 #
 
 macro(add_crashpad)
-  get_property(CRASHPAD_CHECKED GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE)
-
   set (USE_CRASHPAD TRUE)
   if ("$ENV{CMAKE_BACKTRACE_URL}" STREQUAL "")
     set (USE_CRASHPAD FALSE)
@@ -25,17 +23,36 @@ macro(add_crashpad)
     set (CMAKE_BACKTRACE_TOKEN $ENV{CMAKE_BACKTRACE_TOKEN})
   endif()
 
-  if (WIN32 AND USE_CRASHPAD AND NOT CRASHPAD_CHECKED)
+  if (WIN32 AND USE_CRASHPAD)
-    set_property(GLOBAL PROPERTY HAS_CRASHPAD TRUE)
+    get_property(CRASHPAD_CHECKED GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE)
+    if (NOT CRASHPAD_CHECKED)
+        
+        add_dependency_external_projects(crashpad)
+        find_package(crashpad REQUIRED)
+
+        set_property(GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE TRUE)
+    endif()
+
     add_definitions(-DHAS_CRASHPAD)
     add_definitions(-DCMAKE_BACKTRACE_URL=\"${CMAKE_BACKTRACE_URL}\")
     add_definitions(-DCMAKE_BACKTRACE_TOKEN=\"${CMAKE_BACKTRACE_TOKEN}\")
 
-    add_dependency_external_projects(crashpad)
-    find_package(crashpad REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${CRASHPAD_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME} ${CRASHPAD_LIBRARY} ${CRASHPAD_BASE_LIBRARY} ${CRASHPAD_UTIL_LIBRARY})
+    
+    if (WIN32)
+      set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099")
+    endif()
 
-    set_property(GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE TRUE)
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy ${CRASHPAD_HANDLER_EXE_PATH} "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
+    )
+    install(
+      PROGRAMS ${CRASHPAD_HANDLER_EXE_PATH}
+      DESTINATION ${CLIENT_COMPONENT}
+      COMPONENT ${INTERFACE_INSTALL_DIR}
+    )
   endif ()
 endmacro()

cmake/macros/PackageCrashpadForDeployment.cmake

@@ -1,32 +0,0 @@
-#
-#  PackageCrashpadForDeployment.cmake
-#  cmake/macros
-#
-#  Copyright 2018 High Fidelity, Inc.
-#  Created by Clement Brisset on  01/19/18
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
-
-macro(PACKAGE_CRASHPAD_FOR_DEPLOYMENT)
-  get_property(HAS_CRASHPAD GLOBAL PROPERTY HAS_CRASHPAD)
-
-  if (HAS_CRASHPAD)
-
-    if (WIN32)
-      set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099")
-    endif()
-
-    add_custom_command(
-      TARGET ${TARGET_NAME}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${CRASHPAD_HANDLER_EXE_PATH} "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
-    )
-    install(
-      PROGRAMS ${CRASHPAD_HANDLER_EXE_PATH}
-      DESTINATION ${CLIENT_COMPONENT}
-      COMPONENT ${INTERFACE_INSTALL_DIR}
-    )
-  endif ()
-endmacro()

interface/CMakeLists.txt

@@ -216,6 +216,7 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries
 
 target_bullet()
 target_opengl()
+add_crashpad()
 
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
@@ -347,8 +348,6 @@ if (SCRIPTS_INSTALL_DIR)
   )
 endif()
 
-package_crashpad_for_deployment()
-
 if (WIN32)
     set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/resources/qml\"")
 

interface/src/Application.cpp

@@ -145,6 +145,7 @@
 #include "avatar/AvatarManager.h"
 #include "avatar/MyHead.h"
 #include "CrashHandler.h"
+#include "Crashpad.h"
 #include "devices/DdeFaceTracker.h"
 #include "DiscoverabilityManager.h"
 #include "GLCanvas.h"

interface/src/Application.h

@@ -47,7 +47,6 @@
 #include <shared/RateCounter.h>
 #include <ThreadSafeValueCache.h>
 #include <shared/FileLogger.h>
-#include <shared/Crashpad.h>
 
 #include <RunningMarker.h>
 

interface/src/main.cpp

@@ -24,10 +24,10 @@
 #include <SandboxUtils.h>
 #include <SharedUtil.h>
 #include <NetworkAccessManager.h>
-#include <shared/Crashpad.h>
 
 #include "AddressManager.h"
 #include "Application.h"
+#include "Crashpad.h"
 #include "InterfaceLogging.h"
 #include "UserActivityLogger.h"
 #include "MainWindow.h"

libraries/shared/CMakeLists.txt

@@ -5,8 +5,6 @@ setup_hifi_library(Gui Network Script Widgets)
 
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Wbemuuid.lib)
-
-    add_crashpad()
 endif()
 
 target_zlib()