diff --git a/cmake/macros/AddCrashpad.cmake b/cmake/macros/AddCrashpad.cmake index 8694c4968a..bf59418f37 100644 --- a/cmake/macros/AddCrashpad.cmake +++ b/cmake/macros/AddCrashpad.cmake @@ -12,25 +12,25 @@ macro(add_crashpad) set (USE_CRASHPAD TRUE) if ("$ENV{CMAKE_BACKTRACE_URL}" STREQUAL "") - set (USE_CRASHPAD FALSE) + set(USE_CRASHPAD FALSE) else() - set (CMAKE_BACKTRACE_URL $ENV{CMAKE_BACKTRACE_URL}) + set(CMAKE_BACKTRACE_URL $ENV{CMAKE_BACKTRACE_URL}) endif() if ("$ENV{CMAKE_BACKTRACE_TOKEN}" STREQUAL "") - set (USE_CRASHPAD FALSE) + set(USE_CRASHPAD FALSE) else() - set (CMAKE_BACKTRACE_TOKEN $ENV{CMAKE_BACKTRACE_TOKEN}) + set(CMAKE_BACKTRACE_TOKEN $ENV{CMAKE_BACKTRACE_TOKEN}) endif() if (WIN32 AND USE_CRASHPAD) 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) + add_dependency_external_projects(crashpad) + find_package(crashpad REQUIRED) + + set_property(GLOBAL PROPERTY CHECKED_FOR_CRASHPAD_ONCE TRUE) endif() add_definitions(-DHAS_CRASHPAD) @@ -39,7 +39,7 @@ macro(add_crashpad) 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() diff --git a/interface/src/Crashpad.cpp b/interface/src/Crashpad.cpp index f28cad2d18..8ed3fc23bd 100644 --- a/interface/src/Crashpad.cpp +++ b/interface/src/Crashpad.cpp @@ -1,6 +1,6 @@ // // Crashpad.cpp -// shared/src/shared +// interface/src // // Created by Clement Brisset on 01/19/18. // Copyright 2018 High Fidelity, Inc. diff --git a/interface/src/Crashpad.h b/interface/src/Crashpad.h index c4c559f459..a815ed701a 100644 --- a/interface/src/Crashpad.h +++ b/interface/src/Crashpad.h @@ -1,6 +1,6 @@ // // Crashpad.h -// shared/src/shared +// interface/src // // Created by Clement Brisset on 01/19/18. // Copyright 2018 High Fidelity, Inc.