From 093fff9c9e3ae775aa639be6c90bc316804daadc Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 2 Nov 2017 11:14:35 -0700 Subject: [PATCH] Add crashpad --- cmake/macros/PackageCrashpadForDeployment.cmake | 5 +---- interface/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/macros/PackageCrashpadForDeployment.cmake b/cmake/macros/PackageCrashpadForDeployment.cmake index adee7a79e6..1808ddc3d1 100644 --- a/cmake/macros/PackageCrashpadForDeployment.cmake +++ b/cmake/macros/PackageCrashpadForDeployment.cmake @@ -19,12 +19,9 @@ macro(PACKAGE_CRASHPAD_FOR_DEPLOYMENT) COMMAND ${CMAKE_COMMAND} -E copy ${CRASHPAD_HANDLER_EXE_PATH} "$/" ) install( - PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/crashpad_handler.exe" + PROGRAMS ${CRASHPAD_HANDLER_EXE_PATH} DESTINATION ${CLIENT_COMPONENT} COMPONENT ${INTERFACE_INSTALL_DIR} ) - - message(STATUS "CRASHPAD_HANDLER_EXE_PATH: ${CRASHPAD_HANDLER_EXE_PATH}") - message(STATUS "Target: $") endif () endmacro() diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 6cb1c352c7..b64ad20239 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -349,6 +349,8 @@ endif() package_crashpad_for_deployment() +package_crashpad_for_deployment() + if (WIN32) set(EXTRA_DEPLOY_OPTIONS "--qmldir \"${PROJECT_SOURCE_DIR}/resources/qml\"")