From c92b3d7f0b4f91867b961cb0a4109727360bda1f Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Mon, 28 Nov 2016 13:28:55 +0100 Subject: [PATCH] CMake: Add the NINJA_ARGS config variable, set -j 4 in Travis, 2 in AppVeyor --- .travis.yml | 4 ++-- CMakeLists.txt | 1 + Targets/WebRTC/CMakeLists.txt | 4 ++-- appveyor.yml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53062be..feaece7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ matrix: - os: linux sudo: required - os: osx - osx_image: xcode7 + osx_image: xcode7.3 language: cpp @@ -43,7 +43,7 @@ install: - git submodule update - mkdir out - cd out -- cmake .. +- cmake -DNINJA_ARGS="-j 4" .. script: - make package diff --git a/CMakeLists.txt b/CMakeLists.txt index f76df9c..02c27c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ find_package(DepotTools REQUIRED) option(BUILD_TESTS "Build test binaries" OFF) option(BUILD_SAMPLES "Build samples binaries" OFF) +set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass before compiling WebRTC") # # Versioning diff --git a/Targets/WebRTC/CMakeLists.txt b/Targets/WebRTC/CMakeLists.txt index 946ebeb..db692eb 100644 --- a/Targets/WebRTC/CMakeLists.txt +++ b/Targets/WebRTC/CMakeLists.txt @@ -88,7 +88,7 @@ add_libwebrtc_command(webrtc-clang # # Run the build command # -set(LIBWEBRTC_BUILD_CMD ninja -C out/Default) +set(LIBWEBRTC_BUILD_CMD ninja ${NINJA_ARGS} -C out/Default) add_libwebrtc_command(webrtc-ninja "Build" "${LIBWEBRTC_BUILD_CMD}" @@ -109,4 +109,4 @@ ExternalProject_Add(libwebrtc CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIBWEBRTC_INCLUDE_DIR:STRING=${CMAKE_BINARY_DIR}/src/webrtc - -DLIBWEBRTC_OUTPUT_DIR:PATH=${CMAKE_BINARY_DIR}/src/out/Default) \ No newline at end of file + -DLIBWEBRTC_OUTPUT_DIR:PATH=${CMAKE_BINARY_DIR}/src/out/Default) diff --git a/appveyor.yml b/appveyor.yml index df06dc7..c80a9e2 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 . + - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc -DNINJA_ARGS="-j 2" . artifacts: - path: libwebrtc-0.0.1-rc.4-win32-x64.7z