From cecd903ad9baff6831342ff6babd4160c2e669bf Mon Sep 17 00:00:00 2001 From: Andres Noetzli Date: Wed, 16 Sep 2015 13:12:52 -0700 Subject: [PATCH] Fix gflags build in Travis script Summary: There were two minor issues with 9566342d28fedf3bf90c1a5ee4cc8e6246585ed8: - The install command was doing `cmake` instead of `cmake .` - `LIBRARY_PATH` was not set Fix both issues. Test Plan: Run tests on Travis: https://travis-ci.org/facebook/rocksdb/jobs/80699627 (bloom_test works now). Reviewers: igor Reviewed By: igor Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D47103 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25404905c..948de4886 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,13 @@ matrix: install: # Build gflags # TODO(noetzli): Remove when gflags available through Travis - - pushd /tmp/ && curl -L https://github.com/gflags/gflags/archive/v2.1.2.tar.gz -o gflags.tar.gz && tar xfz gflags.tar.gz && cd gflags-2.1.2 && cmake && make && popd + - pushd /tmp/ && curl -L https://github.com/gflags/gflags/archive/v2.1.2.tar.gz -o gflags.tar.gz && tar xfz gflags.tar.gz && cd gflags-2.1.2 && cmake . && make && popd before_script: # Add gflags to include/library paths # TODO(noetzli): Remove when gflags available through Travis - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/tmp/gflags-2.1.2/lib" + - export LIBRARY_PATH="$LIBRARY_PATH:/tmp/gflags-2.1.2/lib" - export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:/tmp/gflags-2.1.2/include" - if [ -n "${COMPILER}" ]; then CXX=${COMPILER}; fi - if [[ $(uname -s) == 'Darwin' ]]; then brew install gflags snappy; fi -- GitLab