3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[breakpad] Fix build failure on OSX (#11984)

Browse Source 
* [breakpad] Fix build failure on OSX

* update baseline

* Update portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
Jack·Boos·Yu 2020-06-18 02:19:55 +08:00 committed by GitHub
parent f80c61927b
commit a4d42aac24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/breakpad/CMakeLists.txt
View File

@ -77,15 +77,16 @@ if(INSTALL_HEADERS)
if(WIN32) if(WIN32)
set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests")
elseif(APPLE) elseif(APPLE)
set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests") set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/*proj|/gcov")
else() else()
set(HEADER_EXCLUDE_REGEX "/apple|/ios|/client/linux/data|/client/linux/sender|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") set(HEADER_EXCLUDE_REGEX "/apple|/ios|/client/linux/data|/client/linux/sender|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests")
endif() endif()
install( install(
DIRECTORY src/client src/common src/google_breakpad DIRECTORY src/client src/common src/google_breakpad
DESTINATION include/ DESTINATION include/
FILES_MATCHING PATTERN "*.h" FILES_MATCHING
REGEX "${HEADER_EXCLUDE_REGEX}" EXCLUDE PATTERN "*.h"
REGEX ${HEADER_EXCLUDE_REGEX} EXCLUDE
) )
endif() endif()

2
ports/breakpad/CONTROL
View File

@ -1,5 +1,5 @@
Source: breakpad Source: breakpad
Version: 2019-07-11-1 Version: 2019-07-11-2
Build-Depends: libdisasm Build-Depends: libdisasm
Homepage: https://github.com/google/breakpad Homepage: https://github.com/google/breakpad
Description: a set of client and server components which implement a crash-reporting system. Description: a set of client and server components which implement a crash-reporting system.

10
ports/breakpad/portfile.cmake
View File

@ -1,15 +1,13 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO google/breakpad REPO google/breakpad
REF c46151db0ffd1a8dae914e45f1212ef427f61ed3 REF c46151db0ffd1a8dae914e45f1212ef427f61ed3
SHA512 bd9f247851a3caa6f36574c8a243c2a01cb1cf23c2266b6f6786b85c7418dba5937363c00184e26cda24225f96bb7aaeb08efd13d6a269a3b78c357c2eda7e14 SHA512 bd9f247851a3caa6f36574c8a243c2a01cb1cf23c2266b6f6786b85c7418dba5937363c00184e26cda24225f96bb7aaeb08efd13d6a269a3b78c357c2eda7e14
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-unique_ptr.patch fix-unique_ptr.patch
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -25,4 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-breakpad TARGET_PATH shar
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/breakpad RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
scripts/ci.baseline.txt
View File

@ -173,7 +173,6 @@ botan:x64-uwp=fail
box2d:x64-uwp=fail box2d:x64-uwp=fail
box2d:arm-uwp=fail box2d:arm-uwp=fail
breakpad:arm64-windows=fail breakpad:arm64-windows=fail
breakpad:x64-osx=fail
bullet3:arm64-windows=fail bullet3:arm64-windows=fail
bullet3:arm-uwp=fail bullet3:arm-uwp=fail
bullet3:x64-uwp=fail bullet3:x64-uwp=fail