mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 10:39:08 +08:00
updatedgoogle benchmark to current trunk due to problems with variadic templated benchmarks with visual studio
This commit is contained in:
parent
bff6bdb53f
commit
b1b72eaef5
@ -1,3 +1,3 @@
|
||||
Source: benchmark
|
||||
Version: 1.1.0-1
|
||||
Version: 1.2.0-1
|
||||
Description: A library to support the benchmarking of functions, similar to unit-tests.
|
||||
|
@ -1,27 +1,12 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 4038875..94d2aea 100644
|
||||
index 244484b..903dea4 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -28,17 +28,20 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
endif()
|
||||
|
||||
# Expose public API
|
||||
-target_include_directories(benchmark PUBLIC ${PROJECT_SOURCE_DIR}/include)
|
||||
+target_include_directories(benchmark PRIVATE ${PROJECT_SOURCE_DIR}/include)
|
||||
|
||||
# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
|
||||
install(
|
||||
TARGETS benchmark
|
||||
+ EXPORT benchmarkTargets
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin
|
||||
- COMPONENT library)
|
||||
+ INCLUDES DESTINATION include)
|
||||
|
||||
install(
|
||||
DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.*h")
|
||||
+
|
||||
+install(EXPORT benchmarkTargets NAMESPACE benchmark:: DESTINATION share/benchmark)
|
||||
@@ -37,7 +37,7 @@ endif()
|
||||
set(include_install_dir "include")
|
||||
set(lib_install_dir "lib/")
|
||||
set(bin_install_dir "bin/")
|
||||
-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
|
||||
+set(config_install_dir "share/${PROJECT_NAME}/cmake/")
|
||||
|
||||
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
|
||||
|
@ -12,8 +12,10 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/benchmark
|
||||
REF v1.1.0
|
||||
SHA512 533061531e6a37723a626addc9e779018c4c2cfc8634ae45860eec0d3800103b5b562f865ac1dc0c8dbe045579b81e59de887e1c48318cebf160f03c18321831
|
||||
REF 6d8339dd97afea4633e54ed4b42307aff4386040
|
||||
#REF 1.1.0
|
||||
SHA512 d9b67ad9876c99102668364e89041bda24090aca39335155624183412d8e8c9e7a9f0585af859c0380af39a3ce40f6db1601bb3397a584f20edca760b31188a2
|
||||
#SHA512 533061531e6a37723a626addc9e779018c4c2cfc8634ae45860eec0d3800103b5b562f865ac1dc0c8dbe045579b81e59de887e1c48318cebf160f03c18321831
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
@ -36,6 +38,7 @@ vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_cmake_targets()
|
||||
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user