feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

crashpad: fix windows builds + show settings checkbox

Browse Source 
coreplugin/CMakeLists.txt uses BUILD_WITH_CRASHPAD and not
the old not existing variables

Change-Id: I5ad9ebb3cf0ac1ee06d53a1e276d70a194b0ace4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2021-03-29 13:19:36 +02:00
parent efc6d08915
commit dc2710cd00
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/FindCrashpad.cmake
View File

@@ -49,6 +49,14 @@ find_path(CRASHPAD_LIB_DIR
"${CMAKE_PREFIX_PATH}" "${CMAKE_PREFIX_PATH}"
) )
find_path(CRASHPAD_GEN_DIR
NAMES build/chromeos_buildflags.h
PATH_SUFFIXES gen
HINTS
"${CRASHPAD_BIN_DIR}"
"${CMAKE_PREFIX_PATH}"
)
if(APPLE) if(APPLE)
find_path(CRASHPAD_OBJ_DIR find_path(CRASHPAD_OBJ_DIR
NAMES mig_output.child_portServer.o NAMES mig_output.child_portServer.o
@@ -58,13 +66,6 @@ if(APPLE)
"${CRASHPAD_LIB_DIR}/out/Default" "${CRASHPAD_LIB_DIR}/out/Default"
"${CMAKE_PREFIX_PATH}" "${CMAKE_PREFIX_PATH}"
) )
find_path(CRASHPAD_GEN_DIR
NAMES build/chromeos_buildflags.h
PATH_SUFFIXES gen
HINTS
"${CRASHPAD_BIN_DIR}"
"${CMAKE_PREFIX_PATH}"
)
set(CRASHPAD_APPLE_VARS CRASHPAD_OBJ_DIR CRASHPAD_GEN_DIR) set(CRASHPAD_APPLE_VARS CRASHPAD_OBJ_DIR CRASHPAD_GEN_DIR)
find_library(FWbsm bsm) find_library(FWbsm bsm)
find_library(FWAppKit AppKit) find_library(FWAppKit AppKit)
@@ -81,7 +82,8 @@ if(Crashpad_FOUND)
add_library(Crashpad::Crashpad UNKNOWN IMPORTED) add_library(Crashpad::Crashpad UNKNOWN IMPORTED)
target_include_directories(Crashpad::Crashpad INTERFACE target_include_directories(Crashpad::Crashpad INTERFACE
"${CRASHPAD_INCLUDE_DIR}" "${CRASHPAD_INCLUDE_DIR}"
"${CRASHPAD_INCLUDE_DIR}/third_party/mini_chromium/mini_chromium") "${CRASHPAD_INCLUDE_DIR}/third_party/mini_chromium/mini_chromium"
"${CRASHPAD_GEN_DIR}")
if(WIN32) if(WIN32)
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"
@@ -106,7 +108,6 @@ if(Crashpad_FOUND)
${FWbsm} ${FWAppKit} ${FWIOKit} ${FWSecurity}) ${FWbsm} ${FWAppKit} ${FWIOKit} ${FWSecurity})
set_target_properties(Crashpad::Crashpad PROPERTIES set_target_properties(Crashpad::Crashpad PROPERTIES
IMPORTED_LOCATION "${CRASHPAD_LIB_DIR}/client/libclient.a") IMPORTED_LOCATION "${CRASHPAD_LIB_DIR}/client/libclient.a")
target_include_directories(Crashpad::Crashpad INTERFACE "${CRASHPAD_GEN_DIR}")
elseif(UNIX) elseif(UNIX)
# TODO: Crashpad is not well supported on linux currently # TODO: Crashpad is not well supported on linux currently
target_link_libraries(Crashpad::Crashpad INTERFACE target_link_libraries(Crashpad::Crashpad INTERFACE

14
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -186,16 +186,10 @@ extend_qtc_plugin(Core
SOURCES progressmanager/progressmanager_x11.cpp SOURCES progressmanager/progressmanager_x11.cpp
) )
if (CRASHPAD_BACKEND_URL extend_qtc_plugin(Core
AND CRASHPAD_SRC CONDITION BUILD_WITH_CRASHPAD
AND EXISTS "${CRASHPAD_SRC}" DEFINES ENABLE_CRASHPAD
AND CRASHPAD_BUILD )
AND EXISTS "${CRASHPAD_BUILD}"
AND (WIN32 OR APPLE)) # LINUX isn't supported for now
extend_qtc_plugin(Core
DEFINES ENABLE_CRASHPAD
)
endif()
if ((NOT WIN32) AND (NOT APPLE)) if ((NOT WIN32) AND (NOT APPLE))
# install logo # install logo