Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #17 from Atlante45/interface-backtrace

Browse source 
Fix spaces
This commit is contained in:
Seth Alves 2018-01-30 12:24:07 -08:00 committed by GitHub
commit bc014214fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/macros/AddCrashpad.cmake
View file

@ -12,25 +12,25 @@
macro(add_crashpad) macro(add_crashpad)
set (USE_CRASHPAD TRUE) set (USE_CRASHPAD TRUE)
if ("$ENV{CMAKE_BACKTRACE_URL}" STREQUAL "") if ("$ENV{CMAKE_BACKTRACE_URL}" STREQUAL "")
set (USE_CRASHPAD FALSE) set(USE_CRASHPAD FALSE)
else() else()
set (CMAKE_BACKTRACE_URL $ENV{CMAKE_BACKTRACE_URL}) set(CMAKE_BACKTRACE_URL $ENV{CMAKE_BACKTRACE_URL})
endif() endif()
if ("$ENV{CMAKE_BACKTRACE_TOKEN}" STREQUAL "") if ("$ENV{CMAKE_BACKTRACE_TOKEN}" STREQUAL "")
set (USE_CRASHPAD FALSE) set(USE_CRASHPAD FALSE)
else() else()
set (CMAKE_BACKTRACE_TOKEN $ENV{CMAKE_BACKTRACE_TOKEN}) set(CMAKE_BACKTRACE_TOKEN $ENV{CMAKE_BACKTRACE_TOKEN})
endif() endif()
if (WIN32 AND USE_CRASHPAD) if (WIN32 AND USE_CRASHPAD)
get_property(CRASHPAD_CHECKED GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE) get_property(CRASHPAD_CHECKED GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE)
if (NOT CRASHPAD_CHECKED) if (NOT CRASHPAD_CHECKED)
add_dependency_external_projects(crashpad)
find_package(crashpad REQUIRED)
set_property(GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE TRUE) add_dependency_external_projects(crashpad)
find_package(crashpad REQUIRED)
set_property(GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE TRUE)
endif() endif()
add_definitions(-DHAS_CRASHPAD) add_definitions(-DHAS_CRASHPAD)
@ -39,7 +39,7 @@ macro(add_crashpad)
target_include_directories(${TARGET_NAME} PRIVATE ${CRASHPAD_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PRIVATE ${CRASHPAD_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${CRASHPAD_LIBRARY} ${CRASHPAD_BASE_LIBRARY} ${CRASHPAD_UTIL_LIBRARY}) target_link_libraries(${TARGET_NAME} ${CRASHPAD_LIBRARY} ${CRASHPAD_BASE_LIBRARY} ${CRASHPAD_UTIL_LIBRARY})
if (WIN32) if (WIN32)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099") set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099")
endif() endif()

2
interface/src/Crashpad.cpp
View file

@ -1,6 +1,6 @@
// //
// Crashpad.cpp // Crashpad.cpp
// shared/src/shared // interface/src
// //
// Created by Clement Brisset on 01/19/18. // Created by Clement Brisset on 01/19/18.
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.

2
interface/src/Crashpad.h
View file

@ -1,6 +1,6 @@
// //
// Crashpad.h // Crashpad.h
// shared/src/shared // interface/src
// //
// Created by Clement Brisset on 01/19/18. // Created by Clement Brisset on 01/19/18.
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.