From 58e7553592b74690806e8c3138c3b33c56ce030e Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 26 Nov 2016 09:52:41 +0100 Subject: [PATCH] CMake: Create another directory --- .travis.yml | 4 +++- Targets/WebRTC/CMakeLists.txt | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a98c38..1a06e0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,9 @@ addons: install: - git submodule init - git submodule update -- cmake . +- mkdir out +- cd out +- cmake .. script: - make package diff --git a/Targets/WebRTC/CMakeLists.txt b/Targets/WebRTC/CMakeLists.txt index 78604fa..a7733a7 100644 --- a/Targets/WebRTC/CMakeLists.txt +++ b/Targets/WebRTC/CMakeLists.txt @@ -20,7 +20,14 @@ ExternalProject_Add(webrtc DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" - INSTALL_COMMAND "") + INSTALL_COMMAND "" + + LOG_DOWNLOAD 0 + LOG_UPDATE 0 + LOG_CONFIGURE 0 + LOG_BUILD 0 + LOG_TEST 0 + LOG_INSTALL 0) # # Configure gclient @@ -112,10 +119,13 @@ add_libwebrtc_command(webrtc-build # ExternalProject_Add(libwebrtc DEPENDS webrtc-build + INSTALL_DIR ${CMAKE_BINARY_DIR}/install SOURCE_DIR ${CMAKE_SOURCE_DIR}/Targets/libwebrtc BINARY_DIR ${CMAKE_BINARY_DIR}/libwebrtc + PATCH_COMMAND "" + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DLIBWEBRTC_INCLUDE_DIR:STRING=${CMAKE_BINARY_DIR}/src/webrtc