[crashpad] use vcpkg_cmake_get_vars (#25864)

* [crashpad] use vcpkg_cmake_get_vars

* v db

* disable uwp for crashpad.

* v db
This commit is contained in:
Alexander Neumann 2022-07-25 23:00:13 +02:00 committed by GitHub
parent f7da57f9e1
commit 6b67ad7e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 16 deletions

View File

@ -66,23 +66,20 @@ set(OPTIONS_REL "")
if(CMAKE_HOST_WIN32)
# Load toolchains
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake")
endif()
include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS
CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
string(STRIP "${${_VAR}}" ${_VAR})
endforeach()
vcpkg_cmake_get_vars(cmake_vars_file)
include("${cmake_vars_file}")
set(OPTIONS_DBG "${OPTIONS_DBG} \
extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \
extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"")
extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_DEBUG}\" \
extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_DEBUG}\" \
extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}\" \
extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}\"")
set(OPTIONS_REL "${OPTIONS_REL} \
extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \
extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"")
extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_RELEASE}\" \
extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_RELEASE}\" \
extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}\" \
extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}\"")
set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\
extra_cflags=\"/GL-\" \

View File

@ -1,15 +1,19 @@
{
"name": "crashpad",
"version-date": "2022-04-16",
"port-version": 1,
"port-version": 2,
"description": [
"Crashpad is a crash-reporting system.",
"Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."
],
"homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md",
"license": "Apache-2.0",
"supports": "osx | windows",
"supports": "osx | (windows & !uwp)",
"dependencies": [
{
"name": "vcpkg-cmake-get-vars",
"host": true
},
{
"name": "vcpkg-tool-gn",
"host": true

View File

@ -1702,7 +1702,7 @@
},
"crashpad": {
"baseline": "2022-04-16",
"port-version": 1
"port-version": 2
},
"crashrpt": {
"baseline": "1.4.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b",
"version-date": "2022-04-16",
"port-version": 2
},
{
"git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159",
"version-date": "2022-04-16",