From c10f3458f0be1dc749e2cd95ebed9bafaa1da54c Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sun, 19 Mar 2017 10:25:22 +0100 Subject: [PATCH] Enable parallel build for CI, remove -j 4 flag everywhere, fixes #34 --- .travis.yml | 4 ++-- README.md | 6 +----- appveyor.yml | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d95d10..c660413 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ install: - git submodule update - mkdir out - cd out -- cmake -DNINJA_ARGS="-j 4" -DGN_EXTRA_ARGS="clang_use_chrome_plugins=false" .. +- cmake -DGN_EXTRA_ARGS="clang_use_chrome_plugins=false" .. script: -- make package +- make -j 4 package deploy: provider: releases diff --git a/README.md b/README.md index 88972c0..2836881 100644 --- a/README.md +++ b/README.md @@ -209,11 +209,7 @@ perform cross-compiling. - **NINJA_ARGS** - Arguments to pass while executing the `ninja` command. For instance, you can - define the number of cores you would like to use, in order to speed-up the - build process: - - `cmake -DNINJA_ARGS="-j 4" ..` + Arguments to pass while executing the `ninja` command. - **TARGET_OS** diff --git a/appveyor.yml b/appveyor.yml index c80a9e2..df06dc7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ build: before_build: - cd c:\projects\libwebrtc - git submodule update --init --recursive - - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc -DNINJA_ARGS="-j 2" . + - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . artifacts: - path: libwebrtc-0.0.1-rc.4-win32-x64.7z