forked from qt-creator/qt-creator
Crashpad: Fix linking on Windows
Looks like symbols moved to client/common.lib (CrashReportDatabase, CrashpadInfo, Settings) in newer versions of Crashpad. Need to link against it to avoid missing symbols. Change-Id: I18506105c098379ee9325138ca4a5197a622e2f7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -69,10 +69,16 @@ if(Crashpad_FOUND)
|
|||||||
"${CRASHPAD_INCLUDE_DIR}/third_party/mini_chromium/mini_chromium"
|
"${CRASHPAD_INCLUDE_DIR}/third_party/mini_chromium/mini_chromium"
|
||||||
"${CRASHPAD_GEN_DIR}")
|
"${CRASHPAD_GEN_DIR}")
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
set(COMMON_LIB "${CRASHPAD_LIB_DIR}/client/common.lib")
|
||||||
|
# might not exist in older versions
|
||||||
|
if (NOT EXISTS "${COMMON_LIB}")
|
||||||
|
set(COMMON_LIB "")
|
||||||
|
endif()
|
||||||
target_link_libraries(Crashpad::Crashpad INTERFACE
|
target_link_libraries(Crashpad::Crashpad INTERFACE
|
||||||
"${CRASHPAD_LIB_DIR}/third_party/mini_chromium/mini_chromium/base/base.lib"
|
"${CRASHPAD_LIB_DIR}/third_party/mini_chromium/mini_chromium/base/base.lib"
|
||||||
"${CRASHPAD_LIB_DIR}/util/util.lib"
|
"${CRASHPAD_LIB_DIR}/util/util.lib"
|
||||||
"${CRASHPAD_LIB_DIR}/client/client.lib"
|
"${CRASHPAD_LIB_DIR}/client/client.lib"
|
||||||
|
"${COMMON_LIB}"
|
||||||
advapi32)
|
advapi32)
|
||||||
set_target_properties(Crashpad::Crashpad PROPERTIES
|
set_target_properties(Crashpad::Crashpad PROPERTIES
|
||||||
IMPORTED_LOCATION "${CRASHPAD_LIB_DIR}/client/client.lib")
|
IMPORTED_LOCATION "${CRASHPAD_LIB_DIR}/client/client.lib")
|
||||||
|
Reference in New Issue
Block a user