From a376545ad6fe19a548a9f6242710177ab69ba8c0 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 22 Sep 2021 16:47:13 -0700 Subject: [PATCH] cmake: find crashpad common lib This appears to be a new requirement. Our other Crashpad dependencies will need to be updated to match this. --- cmake/FindGoogleCrashpad.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/FindGoogleCrashpad.cmake b/cmake/FindGoogleCrashpad.cmake index a47c57611..b1f35c2fd 100644 --- a/cmake/FindGoogleCrashpad.cmake +++ b/cmake/FindGoogleCrashpad.cmake @@ -73,13 +73,15 @@ endif() # Find the libraries we need set (_crashpad_components - client - util - third_party/mini_chromium/mini_chromium/base + client/client + client/common + util/util + third_party/mini_chromium/mini_chromium/base/base ) set (_crashpad_required CRASHPAD_CLIENT_LIB + CRASHPAD_COMMON_LIB CRASHPAD_UTIL_LIB CRASHPAD_BASE_LIB BREAKPAD_BIN_DIR @@ -102,12 +104,13 @@ endif() foreach (COMPONENT ${_crashpad_components}) get_filename_component(SHORT_COMPONENT ${COMPONENT} NAME) + get_filename_component(LOCATION ${COMPONENT} DIRECTORY) string(TOUPPER ${SHORT_COMPONENT} UPPER_COMPONENT) find_library(CRASHPAD_${UPPER_COMPONENT}_LIB ${SHORT_COMPONENT} HINTS - "${CRASHPAD_LIBRARY_DIRS}/obj/${COMPONENT}" + "${CRASHPAD_LIBRARY_DIRS}/obj/${LOCATION}" NO_DEFAULT_PATH )