Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[crashpad] use vcpkg_cmake_get_vars #25864

Merged
merged 4 commits into from
Jul 25, 2022
Merged

[crashpad] use vcpkg_cmake_get_vars #25864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
026774d
[crashpad] use vcpkg_cmake_get_vars
Neumann-A Jul 19, 2022
c89bb07
v db
Neumann-A Jul 19, 2022
37ae6fb
disable uwp for crashpad.
Neumann-A Jul 20, 2022
d1a353b
v db
Neumann-A Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions ports/crashpad/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-\" \
Expand Down
8 changes: 6 additions & 2 deletions ports/crashpad/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)",
Adela0814 marked this conversation as resolved.
Show resolved Hide resolved
"dependencies": [
{
"name": "vcpkg-cmake-get-vars",
"host": true
},
{
"name": "vcpkg-tool-gn",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@
},
"crashpad": {
"baseline": "2022-04-16",
"port-version": 1
"port-version": 2
},
"crashrpt": {
"baseline": "1.4.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/crashpad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b",
"version-date": "2022-04-16",
"port-version": 2
},
{
"git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159",
"version-date": "2022-04-16",
Expand Down