diff --git a/CMakeLists.txt b/CMakeLists.txt index 8054d98f167..f287b294dbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +message(STATUS "Setting CMAKE_FIND_NO_INSTALL_PREFIX") +set(CMAKE_FIND_NO_INSTALL_PREFIX TRUE) + project(Caffe2 CXX C) # TODO(bwasti): versioning 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)