Skip to content

Commit 78df968

Browse files
authored
[crashpad] fix single config builds (microsoft#42721)
1 parent 9cfeb3b commit 78df968

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

ports/crashpad/portfile.cmake

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
4141
PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
4242
NO_DEFAULT_PATH)
4343

44-
if(_LIBRARY_DEB MATCHES "-NOTFOUND")
44+
if(_LIBRARY_DEB MATCHES "-NOTFOUND" AND NOT VCPKG_BUILD_TYPE)
4545
message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
4646
endif()
4747

@@ -131,10 +131,14 @@ install_headers("${SOURCE_PATH}/util")
131131
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base")
132132
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build")
133133

134-
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
135-
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
134+
if(NOT VCPKG_BUILD_TYPE)
135+
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
136+
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
137+
endif()
136138
if(VCPKG_TARGET_IS_OSX)
137-
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
139+
if(NOT VCPKG_BUILD_TYPE)
140+
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
141+
endif()
138142
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
139143
endif()
140144

ports/crashpad/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "crashpad",
33
"version-date": "2024-04-11",
4-
"port-version": 4,
4+
"port-version": 5,
55
"description": [
66
"Crashpad is a crash-reporting system.",
77
"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."

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@
20462046
},
20472047
"crashpad": {
20482048
"baseline": "2024-04-11",
2049-
"port-version": 4
2049+
"port-version": 5
20502050
},
20512051
"crashrpt": {
20522052
"baseline": "1.4.3",

versions/c-/crashpad.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "8d69f9f6012875359ec0ec69b8808f80a4cf944b",
5+
"version-date": "2024-04-11",
6+
"port-version": 5
7+
},
38
{
49
"git-tree": "3e260774308b256e5831185d41b76510c7268782",
510
"version-date": "2024-04-11",

0 commit comments

Comments
 (0)