From ddee3556d787e46e5fe52ba179b39c5b3b58a871 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 26 Nov 2016 10:59:32 +0100 Subject: [PATCH] CMake: Verbose for Travis --- .travis.yml | 2 +- Targets/WebRTC/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a06e0f..e91b9b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: - cmake .. script: -- make package +- VERBOSE=1 make package - md5sum libwebrtc*.tar.gz deploy: diff --git a/Targets/WebRTC/CMakeLists.txt b/Targets/WebRTC/CMakeLists.txt index a7733a7..a2b5d7f 100644 --- a/Targets/WebRTC/CMakeLists.txt +++ b/Targets/WebRTC/CMakeLists.txt @@ -107,7 +107,7 @@ add_libwebrtc_command(webrtc-generate # Run the build command # set(LIBWEBRTC_BUILD_CMD ninja -C out/Default) -add_libwebrtc_command(webrtc-build +add_libwebrtc_command(webrtc-ninja "Build" "${LIBWEBRTC_BUILD_CMD}" ${CMAKE_BINARY_DIR}/src @@ -118,14 +118,12 @@ add_libwebrtc_command(webrtc-build # Link the library # ExternalProject_Add(libwebrtc - DEPENDS webrtc-build + DEPENDS webrtc-ninja 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