From 7ded8c3f2753cc18f248c9967bdc3715b0a5ed98 Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Mon, 21 Aug 2017 14:32:57 -0700 Subject: [PATCH] cmake: don't look for system install of benchmark --- cmake/Dependencies.cmake | 10 ++-------- cmake/Modules/FindBenchmark.cmake | 25 ------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 cmake/Modules/FindBenchmark.cmake diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 64caf6d3883..2a8eae10960 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -91,14 +91,8 @@ if(BUILD_TEST) add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/googletest/googletest/include) - find_package(Benchmark) - if(Benchmark_FOUND) - list(APPEND Caffe2_DEPENDENCY_LIBS ${Benchmark_LIBRARIES}) - include_directories(SYSTEM ${Benchmark_INCLUDE_DIRS}) - else() - add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/benchmark) - include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/benchmark/include) - endif() + add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/benchmark) + include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third_party/benchmark/include) endif() # ---[ LMDB diff --git a/cmake/Modules/FindBenchmark.cmake b/cmake/Modules/FindBenchmark.cmake deleted file mode 100644 index 8d68cb36f21..00000000000 --- a/cmake/Modules/FindBenchmark.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Try to find the Google Benchmark library and headers. -# Benchmark_FOUND - system has benchmark lib -# Benchmark_INCLUDE_DIRS - the benchmark include directory -# Benchmark_LIBRARIES - libraries needed to use benchmark - -find_path(Benchmark_INCLUDE_DIR - NAMES benchmark/benchmark.h - DOC "The directory where benchmark includes reside" -) - -find_library(Benchmark_LIBRARY - NAMES benchmark - DOC "The benchmark library" -) - -set(Benchmark_INCLUDE_DIRS ${Benchmark_INCLUDE_DIR}) -set(Benchmark_LIBRARIES ${Benchmark_LIBRARY}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Benchmark - FOUND_VAR Benchmark_FOUND - REQUIRED_VARS Benchmark_INCLUDE_DIR Benchmark_LIBRARY -) - -mark_as_advanced(Benchmark_FOUND)