From c10110671b097cd8030162eb14fdfba5373e57df Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Tue, 29 Aug 2017 16:49:51 -0700 Subject: [PATCH] cmake: NO_SYSTEM_ENVIRONMENT_PATH for benchmark In addition to other changes made to benchmark, this is helpful because find_*() will still find files under the install prefix if PREFIX/bin is in your path. --- cmake/Modules/FindBenchmark.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindBenchmark.cmake b/cmake/Modules/FindBenchmark.cmake index 8d68cb36f21..e6420a5eced 100644 --- a/cmake/Modules/FindBenchmark.cmake +++ b/cmake/Modules/FindBenchmark.cmake @@ -4,13 +4,15 @@ # Benchmark_LIBRARIES - libraries needed to use benchmark find_path(Benchmark_INCLUDE_DIR - NAMES benchmark/benchmark.h - DOC "The directory where benchmark includes reside" + NAMES benchmark/benchmark.h + NO_SYSTEM_ENVIRONMENT_PATH + DOC "The directory where benchmark includes reside" ) find_library(Benchmark_LIBRARY - NAMES benchmark - DOC "The benchmark library" + NAMES benchmark + NO_SYSTEM_ENVIRONMENT_PATH + DOC "The benchmark library" ) set(Benchmark_INCLUDE_DIRS ${Benchmark_INCLUDE_DIR}) @@ -18,8 +20,8 @@ set(Benchmark_LIBRARIES ${Benchmark_LIBRARY}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Benchmark - FOUND_VAR Benchmark_FOUND - REQUIRED_VARS Benchmark_INCLUDE_DIR Benchmark_LIBRARY + FOUND_VAR Benchmark_FOUND + REQUIRED_VARS Benchmark_INCLUDE_DIR Benchmark_LIBRARY ) mark_as_advanced(Benchmark_FOUND)