mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: add configs for a CMake+Ninja build (#27)

Browse source
This commit is contained in:
Carlos O'Ryan 2019-10-17 14:47:50 -04:00 committed by GitHub
parent b6c30c0eee
commit 449df1fd37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci/kokoro/docker/build-in-docker-cmake.sh
View file

@ -58,6 +58,10 @@ if [[ "${CODE_COVERAGE:-}" == "yes" ]]; then
"-DCMAKE_BUILD_TYPE=Coverage") "-DCMAKE_BUILD_TYPE=Coverage")
fi fi
if [[ "${USE_NINJA:-}" == "yes" ]]; then
cmake_flags+=( "-GNinja" )
fi
# Avoid unbound variable error with older bash # Avoid unbound variable error with older bash
if [[ "${#cmake_flags[@]}" == 0 ]]; then if [[ "${#cmake_flags[@]}" == 0 ]]; then
cmake "-H${SOURCE_DIR}" "-B${BINARY_DIR}" cmake "-H${SOURCE_DIR}" "-B${BINARY_DIR}"

7
ci/kokoro/docker/build.sh
View file

@ -78,6 +78,9 @@ elif [[ "${BUILD_NAME}" = "clang-3.8" ]]; then
export DISTRO_VERSION=16.04 export DISTRO_VERSION=16.04
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
elif [[ "${BUILD_NAME}" = "ninja" ]]; then
# Compiling with Ninja can catch bugs that may not be caught using Make.
export USE_NINJA=yes
else else
echo "Unknown BUILD_NAME (${BUILD_NAME}). Fix the Kokoro .cfg file." echo "Unknown BUILD_NAME (${BUILD_NAME}). Fix the Kokoro .cfg file."
exit 1 exit 1
@ -211,6 +214,10 @@ docker_flags=(
# CMake builds use this flag. # CMake builds use this flag.
"--env" "CODE_COVERAGE=${CODE_COVERAGE:-}" "--env" "CODE_COVERAGE=${CODE_COVERAGE:-}"
# If set to 'yes', use Ninja as the CMake generator. Ninja is more strict
# that Make and can detect errors in your CMake files, it is also faster.
"--env" "USE_NINJA=${USE_NINJA:-}"
# If set, pass -DGOOGLE_CLOUD_CPP_CXX_STANDARD=<value> to CMake. # If set, pass -DGOOGLE_CLOUD_CPP_CXX_STANDARD=<value> to CMake.
"--env" "GOOGLE_CLOUD_CPP_CXX_STANDARD=${GOOGLE_CLOUD_CPP_CXX_STANDARD:-}" "--env" "GOOGLE_CLOUD_CPP_CXX_STANDARD=${GOOGLE_CLOUD_CPP_CXX_STANDARD:-}"

0
ci/kokoro/docker/ninja-presubmit.cfg Normal file
View file

0
ci/kokoro/docker/ninja.cfg Normal file
View file