Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CA5EB200C4A for ; Sun, 2 Apr 2017 14:21:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C941A160B8E; Sun, 2 Apr 2017 12:21:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1CB34160B77 for ; Sun, 2 Apr 2017 14:21:58 +0200 (CEST) Received: (qmail 69628 invoked by uid 500); 2 Apr 2017 12:21:58 -0000 Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@parquet.apache.org Delivered-To: mailing list commits@parquet.apache.org Received: (qmail 69619 invoked by uid 99); 2 Apr 2017 12:21:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Apr 2017 12:21:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F02B2DFC8E; Sun, 2 Apr 2017 12:21:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: uwe@apache.org To: commits@parquet.apache.org Message-Id: <00bc83c3ce6648b08fc7d6ce88ee8b8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: parquet-cpp git commit: PARQUET-942: Fix wrong variable use in FindSnappy Date: Sun, 2 Apr 2017 12:21:57 +0000 (UTC) archived-at: Sun, 02 Apr 2017 12:22:00 -0000 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 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 Authored: Sun Apr 2 14:21:51 2017 +0200 Committer: Uwe L. Korn 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")