use system cmake on travis and in docker images; remove cmake_expand_…

…lists
apache · Jan 29, 2019 · ca52b30 · ca52b30
1 parent f576c3e
commit ca52b30
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/ci/conda_env_cpp.yml b/ci/conda_env_cpp.yml
@@ -20,7 +20,6 @@
 boost-cpp=1.68.0
 brotli
 bzip2
-cmake
 double-conversion
 flatbuffers
 gflags

diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
@@ -48,7 +48,6 @@ fi
 conda create -y -q -p $CONDA_ENV_DIR \
       --file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
       nomkl \
-      cmake \
       pip \
       numpy=1.14 \
       python=${PYTHON_VERSION} \

diff --git a/cpp/Dockerfile b/cpp/Dockerfile
@@ -23,6 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install -y -q --no-install-recommends \
         ca-certificates \
         ccache \
+        cmake \
         g++ \
         gcc \
         git \

diff --git a/cpp/src/gandiva/precompiled/CMakeLists.txt b/cpp/src/gandiva/precompiled/CMakeLists.txt
@@ -44,8 +44,7 @@ foreach(SRC_FILE ${PRECOMPILED_SRCS})
             -O3 -c ${ABSOLUTE_SRC} -o ${BC_FILE}
             ${ARROW_GANDIVA_PC_CXX_FLAGS}
             -I${CMAKE_SOURCE_DIR}/src
-    DEPENDS ${SRC_FILE}
-    COMMAND_EXPAND_LISTS)
+    DEPENDS ${SRC_FILE})
   list(APPEND BC_FILES ${BC_FILE})
 endforeach()