diff options
| author | Kirill Bobyrev <kbobyrev.opensource@gmail.com> | 2018-08-28 11:05:09 +0000 |
|---|---|---|
| committer | Kirill Bobyrev <kbobyrev.opensource@gmail.com> | 2018-08-28 11:05:09 +0000 |
| commit | 99fc18c387a9c4bc0abd1567c31e08278c7b8613 (patch) | |
| tree | 419b8cd644fd68708c79175997a2d25b7329de67 | |
| parent | 8f3b3df5f8ac373400f0dd7d61411f42b2377050 (diff) | |
| download | bcm5719-llvm-99fc18c387a9c4bc0abd1567c31e08278c7b8613.tar.gz bcm5719-llvm-99fc18c387a9c4bc0abd1567c31e08278c7b8613.zip | |
[NFC] Apply another commit to comply with old CMake
llvm-svn: 340817
| -rw-r--r-- | llvm/utils/benchmark/README.LLVM | 2 | ||||
| -rw-r--r-- | llvm/utils/benchmark/src/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM index 1b6f62d61e4..33d2e4078e5 100644 --- a/llvm/utils/benchmark/README.LLVM +++ b/llvm/utils/benchmark/README.LLVM @@ -11,3 +11,5 @@ Changes: * Bazel BUILD files are removed from the library * https://github.com/google/benchmark/commit/f85304e4e3a0e4e1bf15b91720df4a19e90b589f is applied on top of the v1.4.1 to silence compiler warnings +* https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e + is applied to comply with the LLVM's required CMake version diff --git a/llvm/utils/benchmark/src/CMakeLists.txt b/llvm/utils/benchmark/src/CMakeLists.txt index 701804ba0e0..a8baa9e713e 100644 --- a/llvm/utils/benchmark/src/CMakeLists.txt +++ b/llvm/utils/benchmark/src/CMakeLists.txt @@ -11,7 +11,10 @@ file(GLOB *.cc ${PROJECT_SOURCE_DIR}/include/benchmark/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.h) -list(FILTER SOURCE_FILES EXCLUDE REGEX "benchmark_main\\.cc") +file(GLOB BENCHMARK_MAIN "benchmark_main.cc") +foreach(item ${BENCHMARK_MAIN}) + list(REMOVE_ITEM SOURCE_FILES "${item}") +endforeach() add_library(benchmark ${SOURCE_FILES}) set_target_properties(benchmark PROPERTIES |
