diff options
| author | Mircea Trofin <mtrofin@google.com> | 2021-12-07 16:46:55 -0800 |
|---|---|---|
| committer | Mircea Trofin <mtrofin@google.com> | 2021-12-07 17:10:41 -0800 |
| commit | 5dda2efde574d3a200d04c371f561a77ee9f4aff (patch) | |
| tree | 1a32f91fd0db5308de8f5fbc32613c18275588fe /libcxx/benchmarks | |
| parent | 572d1ecccc473ba4ddb46dd04759dc2e336f0e1c (diff) | |
| download | llvm-5dda2efde574d3a200d04c371f561a77ee9f4aff.tar.gz | |
Re-Reland "[benchmarks] Move libcxx's fork of google/benchmark and llvm/utils'"
This reverts commit b2fbd45d2395f1f6ef39db72b7156724fc101e40. D114922
fixed the reason of the 2nd revert.
This patch also re-applies 39e9f5d3685f3cfca0df072928ad96d973704dff.
Differential Revision: https://reviews.llvm.org/D112012
Diffstat (limited to 'libcxx/benchmarks')
| -rw-r--r-- | libcxx/benchmarks/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt index 8758c6b7534b..8c8c9e4f186e 100644 --- a/libcxx/benchmarks/CMakeLists.txt +++ b/libcxx/benchmarks/CMakeLists.txt @@ -41,7 +41,7 @@ ExternalProject_Add(google-benchmark-libcxx EXCLUDE_FROM_ALL ON DEPENDS cxx cxx-headers PREFIX benchmark-libcxx - SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark + SOURCE_DIR ${LLVM_THIRD_PARTY_DIR}/benchmark INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-libcxx CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} @@ -66,7 +66,7 @@ if (LIBCXX_BENCHMARK_NATIVE_STDLIB) ExternalProject_Add(google-benchmark-native EXCLUDE_FROM_ALL ON PREFIX benchmark-native - SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark + SOURCE_DIR ${LLVM_THIRD_PARTY_DIR}/benchmark INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-native CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} |