Fix GitLab CI

- Update Docker image to Boost 1.70
- Bust dependency cache
- Pass `Boost_NO_BOOST_CMAKE` to CMake
This commit is contained in:
John Freeman
2019-07-11 13:08:04 -05:00
committed by Nik Bougalis
parent 9e117b7b38
commit 20cc5df5fe
2 changed files with 17 additions and 14 deletions

View File

@@ -14,6 +14,9 @@ BUILD_TYPE=${BUILD_TYPE:-Debug}
# the default by setting `$CMAKE_ARGS` to the empty string.
CMAKE_ARGS=${CMAKE_ARGS-'-Dwerr=ON'}
# https://gitlab.kitware.com/cmake/cmake/issues/18865
CMAKE_ARGS="-DBoost_NO_BOOST_CMAKE=ON ${CMAKE_ARGS}"
if [[ ${COMPILER} == 'gcc' ]]; then
export CC='gcc'
export CXX='g++'