Skip to content

Commit

Permalink
ARROW-4414: [C++] Stop using cmake COMMAND_EXPAND_LISTS because it br…
Browse files Browse the repository at this point in the history
…eaks package builds for older distros

COMMAND_EXPAND_LISTS option of add_custom_command is too new on Ubuntu Xenial and Debian stretch. It's available since CMake 3.8

Linux package builds: [kszucs/crossbow/build-434](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=434) (the xenial crossbow error is unrelated)

Author: Krisztián Szűcs <szucs.krisztian@gmail.com>

Closes #3522 from kszucs/ARROW-4414 and squashes the following commits:

23dde8a <Krisztián Szűcs> revert removing cmake from conda_env_cpp
ca52b30 <Krisztián Szűcs> use system cmake on travis and in docker images; remove cmake_expand_lists
  • Loading branch information
kszucs authored and xhochy committed Jan 30, 2019
1 parent 072200f commit 6626c00
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
3 changes: 1 addition & 2 deletions cpp/src/gandiva/precompiled/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 6626c00

Please sign in to comment.