OSDN Git Service

[NFC] Apply another commit to comply with old CMake
authorKirill Bobyrev <kbobyrev.opensource@gmail.com>
Tue, 28 Aug 2018 11:05:09 +0000 (11:05 +0000)
committerKirill Bobyrev <kbobyrev.opensource@gmail.com>
Tue, 28 Aug 2018 11:05:09 +0000 (11:05 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@340817 91177308-0d34-0410-b5e6-96231b3b80d8

utils/benchmark/README.LLVM
utils/benchmark/src/CMakeLists.txt

index 1b6f62d..33d2e40 100644 (file)
@@ -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
index 701804b..a8baa9e 100644 (file)
@@ -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