diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index 3ff4bf3cd00ce7..e7edf4b6bda0a9 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -112,7 +112,7 @@ if(INSTALL_HEADERS) elseif(APPLE) set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov") 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|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") install( DIRECTORY src/third_party/lss DESTINATION include/third_party diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 41a34342d178e2..9e083c42e591e3 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -18,23 +18,23 @@ if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a ) - file(RENAME ${LSS_SOURCE_PATH} ${SOURCE_PATH}/src/third_party/lss) + file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss") endif() -file( - COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc - DESTINATION ${SOURCE_PATH} -) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-breakpad TARGET_PATH share/unofficial-breakpad) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad CONFIG_PATH share/unofficial-breakpad) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index f5b2c998ab3657..59d1b8f7853841 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,11 +1,19 @@ { "name": "breakpad", - "version-string": "2020-09-14", - "port-version": 4, + "version-date": "2020-09-14", + "port-version": 5, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "supports": "!uwp", "dependencies": [ - "libdisasm" + "libdisasm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index fee6a3e8d8baec..8051dbd44e2f54 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1765629f89b1d8d3020f5e4baa35116b9da02c0a", + "version-date": "2020-09-14", + "port-version": 5 + }, { "git-tree": "553a7799e93f9f2b4441d077b379613a796acdea", "version-string": "2020-09-14", diff --git a/versions/baseline.json b/versions/baseline.json index 47237fcf065172..ead9ac931196a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1138,7 +1138,7 @@ }, "breakpad": { "baseline": "2020-09-14", - "port-version": 4 + "port-version": 5 }, "brigand": { "baseline": "1.3.0",