CMake: Verbose for Travis

This commit is contained in:
Axel Isouard 2016-11-26 10:59:32 +01:00
parent b7b3d1c58a
commit ddee3556d7
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
2 changed files with 3 additions and 5 deletions

View file

@ -25,7 +25,7 @@ install:
- cmake .. - cmake ..
script: script:
- make package - VERBOSE=1 make package
- md5sum libwebrtc*.tar.gz - md5sum libwebrtc*.tar.gz
deploy: deploy:

View file

@ -107,7 +107,7 @@ add_libwebrtc_command(webrtc-generate
# Run the build command # Run the build command
# #
set(LIBWEBRTC_BUILD_CMD ninja -C out/Default) set(LIBWEBRTC_BUILD_CMD ninja -C out/Default)
add_libwebrtc_command(webrtc-build add_libwebrtc_command(webrtc-ninja
"Build" "Build"
"${LIBWEBRTC_BUILD_CMD}" "${LIBWEBRTC_BUILD_CMD}"
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
@ -118,14 +118,12 @@ add_libwebrtc_command(webrtc-build
# Link the library # Link the library
# #
ExternalProject_Add(libwebrtc ExternalProject_Add(libwebrtc
DEPENDS webrtc-build DEPENDS webrtc-ninja
INSTALL_DIR ${CMAKE_BINARY_DIR}/install INSTALL_DIR ${CMAKE_BINARY_DIR}/install
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Targets/libwebrtc SOURCE_DIR ${CMAKE_SOURCE_DIR}/Targets/libwebrtc
BINARY_DIR ${CMAKE_BINARY_DIR}/libwebrtc BINARY_DIR ${CMAKE_BINARY_DIR}/libwebrtc
PATCH_COMMAND ""
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install
-DLIBWEBRTC_INCLUDE_DIR:STRING=${CMAKE_BINARY_DIR}/src/webrtc -DLIBWEBRTC_INCLUDE_DIR:STRING=${CMAKE_BINARY_DIR}/src/webrtc