Skip to content

Commit

Permalink
Try setting CMAKE_PREFIX_PATH to llvm-7 tree in test_travis.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
bjodah committed Oct 23, 2018
1 parent e05e17a commit 132f430
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 0 additions & 1 deletion bin/install_travis.sh
Expand Up @@ -106,7 +106,6 @@ if [[ ! -z "${WITH_LLVM}" ]]; then
export LLVM_DIR=$our_install_dir/share/llvm/
elif [[ ! -z "${WITH_SANITIZE}" ]]; then
export LLVM_DIR=/usr/lib/llvm-7/share/llvm/
export CMAKE_PREFIX_PATH=/usr/lib/llvm-7
export CC=clang-7
export CXX=clang++-7
fi
Expand Down
3 changes: 3 additions & 0 deletions bin/test_travis.sh
Expand Up @@ -20,6 +20,9 @@ pwd
echo "Running cmake:"
# We build the command line here. If the variable is empty, we skip it,
# otherwise we pass it to cmake.
if [[ ! -z "${WITH_SANITIZE}" ]]; then
export CMAKE_PREFIX_PATH=/usr/lib/llvm-7
fi
cmake_line="-DCMAKE_INSTALL_PREFIX=$our_install_dir -DCMAKE_PREFIX_PATH=$our_install_dir:${CMAKE_PREFIX_PATH}"
if [[ "${BUILD_TYPE}" != "" ]]; then
cmake_line="$cmake_line -DCMAKE_BUILD_TYPE=${BUILD_TYPE}"
Expand Down

0 comments on commit 132f430

Please sign in to comment.