diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-10 02:43:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 11:43:20 -0700 |
| commit | bdfc26fb8543517bdd18a5312fdb3fe2fa583517 (patch) | |
| tree | 045091c21ef346bb2d1608501c0d78c8b0c1d43a | |
| parent | 8b7e946c55507d491887bbfeb34453ff0c75c751 (diff) | |
| download | vcpkg-bdfc26fb8543517bdd18a5312fdb3fe2fa583517.tar.gz vcpkg-bdfc26fb8543517bdd18a5312fdb3fe2fa583517.zip | |
[benchmark] Update to 1.5.1 and fix pkgconfig (#13427)
| -rw-r--r-- | ports/benchmark/CONTROL | 2 | ||||
| -rw-r--r-- | ports/benchmark/portfile.cmake | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL index d82040748..82e4b57e8 100644 --- a/ports/benchmark/CONTROL +++ b/ports/benchmark/CONTROL @@ -1,5 +1,5 @@ Source: benchmark -Version: 1.5 +Version: 1.5.1 Homepage: https://github.com/google/benchmark Description: A library to support the benchmarking of functions, similar to unit-tests. Supports: !uwp
\ No newline at end of file diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 76cdfb437..9173eff61 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -1,16 +1,13 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - -include(vcpkg_common_functions) +#https://github.com/google/benchmark/issues/661 +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.5.0 - SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3 + REF 8039b4030795b1c9b8cedb78e3a2a6fb89574b6e #v1.5.1 + SHA512 845eaf24ceea35fae0be89fea72ec27326506b1f3677e74a83c8f82dcb55ad6adc9a3d03f849b7b02f90991cd714152c63f9623a480b4f02464a63b5657471d4 HEAD_REF master ) @@ -19,7 +16,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBENCHMARK_ENABLE_TESTING=OFF - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake() @@ -28,9 +24,10 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/benchmark) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/benchmark/LICENSE ${CURRENT_PACKAGES_DIR}/share/benchmark/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |