[llvm] r340817 - [NFC] Apply another commit to comply with old CMake

[Kirill Bobyrev via llvm-commits]

Author: omtcyfz
Date: Tue Aug 28 04:05:09 2018
New Revision: 340817

URL: http://llvm.org/viewvc/llvm-project?rev=340817&view=rev
Log:
[NFC] Apply another commit to comply with old CMake

Modified:
    llvm/trunk/utils/benchmark/README.LLVM
    llvm/trunk/utils/benchmark/src/CMakeLists.txt

Modified: llvm/trunk/utils/benchmark/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/README.LLVM?rev=340817&r1=340816&r2=340817&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/README.LLVM (original)
+++ llvm/trunk/utils/benchmark/README.LLVM Tue Aug 28 04:05:09 2018
@@ -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

Modified: llvm/trunk/utils/benchmark/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/src/CMakeLists.txt?rev=340817&r1=340816&r2=340817&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/src/CMakeLists.txt (original)
+++ llvm/trunk/utils/benchmark/src/CMakeLists.txt Tue Aug 28 04:05:09 2018
@@ -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