diff options
| author | Sergei Nikulov <sergey.nikulov@gmail.com> | 2020-10-14 13:19:35 +0300 |
|---|---|---|
| committer | Sergei Nikulov <snikulov@users.noreply.github.com> | 2020-11-04 12:44:00 +0300 |
| commit | e41ba40debc78d33168855eb4f3aab46b078b53e (patch) | |
| tree | 451d1d69d806c4cb62025fc3aa143c4aaf76df1f | |
| parent | 8bdee98187bc3e4c404387b65981a1ee6be14885 (diff) | |
| download | curl-e41ba40debc78d33168855eb4f3aab46b078b53e.tar.gz | |
travis: use ninja-build for CMake builds
Added package ninja-build to environment
Use ninja to speed up CMake builds
Closes #6077
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | scripts/travis/before_script.sh | 23 |
2 files changed, 13 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 5609c26bc..84e555221 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ addons: - libidn2-dev - gnutls-bin - python-impacket + - ninja-build jobs: include: @@ -79,6 +80,7 @@ jobs: - gnutls-bin # The above list is common_packages minus impacket. - libssh-dev + - ninja-build - env: - T=normal C="--enable-ares" - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" @@ -246,7 +248,7 @@ jobs: - T=iconv - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - env: - - T=cmake BORINGSSL=yes QUICHE=yes C="-DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1" + - T=cmake BORINGSSL=yes QUICHE=yes C="-GNinja -DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1" - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - PKG_CONFIG_PATH="$HOME/quiche/target/release" before_install: @@ -260,7 +262,7 @@ jobs: - libbrotli-dev - libzstd-dev - env: - - T=cmake NGTCP2=yes C="-DUSE_NGTCP2=ON -DCURL_BROTLI=1 -DCURL_ZSTD=1" + - T=cmake NGTCP2=yes C="-GNinja -DUSE_NGTCP2=ON -DCURL_BROTLI=1 -DCURL_ZSTD=1" - *clang - PKG_CONFIG_PATH="$HOME/ngbuild/lib/pkgconfig" compiler: clang diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index 4d3d6f74a..5dd2c7773 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -71,21 +71,16 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then cd $HOME git clone --depth=1 https://boringssl.googlesource.com/boringssl cd boringssl - mkdir build - cd build - CXX="g++" CC="gcc" cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. - make - cd .. + CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 + cmake --build build mkdir lib - cd lib - cp ../build/crypto/libcrypto.so . - cp ../build/ssl/libssl.so . - echo "BoringSSL lib dir: "`pwd` - cd ../build - make clean - rm -f CMakeCache.txt - CXX="g++" CC="gcc" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=on .. - make + cp ./build/crypto/libcrypto.so ./lib/ + cp ./build/ssl/libssl.so ./lib/ + echo "BoringSSL lib dir: "`pwd`"/lib" + cmake --build build --target clean + rm -f build/CMakeCache.txt + CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_POSITION_INDEPENDENT_CODE=on + cmake --build build export LIBS=-lpthread fi |