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

CR

Browse source
This commit is contained in:
Clement 2018-07-10 16:53:11 -07:00
parent 107c5d74ac
commit b5252da3f2
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/externals/crashpad/CMakeLists.txt vendored
View file

@ -1,6 +1,8 @@
include(ExternalProject) include(ExternalProject)
set(EXTERNAL_NAME crashpad) set(EXTERNAL_NAME crashpad)
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
if (WIN32) if (WIN32)
ExternalProject_Add( ExternalProject_Add(
${EXTERNAL_NAME} ${EXTERNAL_NAME}
@ -12,7 +14,6 @@ if (WIN32)
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
) )
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
set(BIN_RELEASE_PATH "${SOURCE_DIR}/out/Release_x64") set(BIN_RELEASE_PATH "${SOURCE_DIR}/out/Release_x64")
@ -32,7 +33,6 @@ elseif (APPLE)
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
) )
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
set(BIN_RELEASE_PATH "${SOURCE_DIR}/out/Release") set(BIN_RELEASE_PATH "${SOURCE_DIR}/out/Release")

1
interface/src/CrashHandler_Crashpad.cpp
View file

@ -107,7 +107,6 @@ bool startCrashHandler(std::string appPath) {
const QDir interfaceDir = interfaceBinary.dir(); const QDir interfaceDir = interfaceBinary.dir();
assert(interfaceDir.exists(CRASHPAD_HANDLER_NAME)); assert(interfaceDir.exists(CRASHPAD_HANDLER_NAME));
const std::string CRASHPAD_HANDLER_PATH = interfaceDir.filePath(CRASHPAD_HANDLER_NAME).toStdString(); const std::string CRASHPAD_HANDLER_PATH = interfaceDir.filePath(CRASHPAD_HANDLER_NAME).toStdString();
qDebug() << "CRASHPAD_HANDLER_PATH:" << CRASHPAD_HANDLER_PATH.c_str();
// Setup different file paths // Setup different file paths
base::FilePath::StringType dbPath; base::FilePath::StringType dbPath;