Repository: parquet-cpp Updated Branches: refs/heads/master 0189ead42 -> 286d75f9a
PARQUET-942: Fix wrong variable use in FindSnappy It should be _snappy_roots instead of SNAPPY_HOME environment variable. If we use SNAPPY_HOME environment variable here, we ignore Snappy_HOME CMake variable. Author: Kouhei Sutou <[email protected]> Closes #288 from kou/fix-wrong-variable-use-in-find-snappy and squashes the following commits: 23f4c14 [Kouhei Sutou] Fix wrong variable use in FindSnappy Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/286d75f9 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/286d75f9 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/286d75f9 Branch: refs/heads/master Commit: 286d75f9ad7c3272a9270f976d8c1965247104bb Parents: 0189ead Author: Kouhei Sutou <[email protected]> Authored: Sun Apr 2 14:21:51 2017 +0200 Committer: Uwe L. Korn <[email protected]> Committed: Sun Apr 2 14:21:51 2017 +0200 ---------------------------------------------------------------------- cmake_modules/FindSnappy.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/286d75f9/cmake_modules/FindSnappy.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake index 6fa0351..4c7ae71 100644 --- a/cmake_modules/FindSnappy.cmake +++ b/cmake_modules/FindSnappy.cmake @@ -40,12 +40,12 @@ endif() message(STATUS "SNAPPY_HOME: $ENV{SNAPPY_HOME}") find_path(SNAPPY_INCLUDE_DIR snappy.h HINTS - $ENV{SNAPPY_HOME} + ${_snappy_roots} NO_DEFAULT_PATH PATH_SUFFIXES "include") find_library( SNAPPY_LIBRARIES NAMES snappy PATHS - $ENV{SNAPPY_HOME} + ${_snappy_roots} NO_DEFAULT_PATH PATH_SUFFIXES "lib")
