summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Nikulov <sergey.nikulov@gmail.com>2020-10-14 13:19:35 +0300
committerSergei Nikulov <snikulov@users.noreply.github.com>2020-11-04 12:44:00 +0300
commite41ba40debc78d33168855eb4f3aab46b078b53e (patch)
tree451d1d69d806c4cb62025fc3aa143c4aaf76df1f /scripts
parent8bdee98187bc3e4c404387b65981a1ee6be14885 (diff)
downloadcurl-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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis/before_script.sh23
1 files changed, 9 insertions, 14 deletions
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