3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[crashpad] fix single config builds (#42721)

Browse Source
This commit is contained in:
Alexander Neumann 2024-12-16 19:09:01 +01:00 committed by GitHub
parent 9cfeb3b011
commit 78df9686ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/crashpad/portfile.cmake
View File

@ -41,7 +41,7 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
if(_LIBRARY_DEB MATCHES "-NOTFOUND") if(_LIBRARY_DEB MATCHES "-NOTFOUND" AND NOT VCPKG_BUILD_TYPE)
message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}") message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
endif() endif()
@ -131,10 +131,14 @@ install_headers("${SOURCE_PATH}/util")
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base")
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build")
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") if(NOT VCPKG_BUILD_TYPE)
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
endif()
if(VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_IS_OSX)
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if(NOT VCPKG_BUILD_TYPE)
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
endif() endif()

2
ports/crashpad/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "crashpad", "name": "crashpad",
"version-date": "2024-04-11", "version-date": "2024-04-11",
"port-version": 4, "port-version": 5,
"description": [ "description": [
"Crashpad is a crash-reporting system.", "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." "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."

2
versions/baseline.json
View File

@ -2046,7 +2046,7 @@
}, },
"crashpad": { "crashpad": {
"baseline": "2024-04-11", "baseline": "2024-04-11",
"port-version": 4 "port-version": 5
}, },
"crashrpt": { "crashrpt": {
"baseline": "1.4.3", "baseline": "1.4.3",

5
versions/c-/crashpad.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "8d69f9f6012875359ec0ec69b8808f80a4cf944b",
"version-date": "2024-04-11",
"port-version": 5
},
{ {
"git-tree": "3e260774308b256e5831185d41b76510c7268782", "git-tree": "3e260774308b256e5831185d41b76510c7268782",
"version-date": "2024-04-11", "version-date": "2024-04-11",