moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 08:38:49 -05:00
Code Issues Releases Wiki Activity

travis: use ninja-build for CMake builds

Browse Source 
Added package ninja-build to environment
Use ninja to speed up CMake builds

Closes #6077
This commit is contained in:
Sergei Nikulov 2020-10-14 13:19:35 +03:00 committed by Sergei Nikulov
parent 8bdee98187
commit e41ba40deb
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -46,6 +46,7 @@ addons:
- libidn2-dev - libidn2-dev
- gnutls-bin - gnutls-bin
- python-impacket - python-impacket
- ninja-build
jobs: jobs:
include: include:
@ -79,6 +80,7 @@ jobs:
- gnutls-bin - gnutls-bin
# The above list is common_packages minus impacket. # The above list is common_packages minus impacket.
- libssh-dev - libssh-dev
- ninja-build
- env: - env:
- T=normal C="--enable-ares" - T=normal C="--enable-ares"
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
@ -246,7 +248,7 @@ jobs:
- T=iconv - T=iconv
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- env: - 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" - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- PKG_CONFIG_PATH="$HOME/quiche/target/release" - PKG_CONFIG_PATH="$HOME/quiche/target/release"
before_install: before_install:
@ -260,7 +262,7 @@ jobs:
- libbrotli-dev - libbrotli-dev
- libzstd-dev - libzstd-dev
- env: - 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 - *clang
- PKG_CONFIG_PATH="$HOME/ngbuild/lib/pkgconfig" - PKG_CONFIG_PATH="$HOME/ngbuild/lib/pkgconfig"
compiler: clang compiler: clang

23
scripts/travis/before_script.sh
View File

@ -71,21 +71,16 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
cd $HOME cd $HOME
git clone --depth=1 https://boringssl.googlesource.com/boringssl git clone --depth=1 https://boringssl.googlesource.com/boringssl
cd boringssl cd boringssl
mkdir build CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1
cd build cmake --build build
CXX="g++" CC="gcc" cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 ..
make
cd ..
mkdir lib mkdir lib
cd lib cp ./build/crypto/libcrypto.so ./lib/
cp ../build/crypto/libcrypto.so . cp ./build/ssl/libssl.so ./lib/
cp ../build/ssl/libssl.so . echo "BoringSSL lib dir: "`pwd`"/lib"
echo "BoringSSL lib dir: "`pwd` cmake --build build --target clean
cd ../build rm -f build/CMakeCache.txt
make clean CXX="g++" CC="gcc" cmake -H. -Bbuild -GNinja -DCMAKE_POSITION_INDEPENDENT_CODE=on
rm -f CMakeCache.txt cmake --build build
CXX="g++" CC="gcc" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=on ..
make
export LIBS=-lpthread export LIBS=-lpthread
fi fi