From c38445b4aa1b45ea901417bafbe489cecd109df3 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 26 Nov 2016 16:10:13 +0100 Subject: [PATCH] CMake: Better steps --- .travis.yml | 2 +- CMakeLists.txt | 9 +++++++-- Targets/WebRTC/CMakeLists.txt | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c629fa..993a7f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: - cmake .. script: -- VERBOSE=1 make package +- make package - md5sum libwebrtc*.tar.gz deploy: diff --git a/CMakeLists.txt b/CMakeLists.txt index 187c1d5..f5623be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 2.8) project(libwebrtc) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} @@ -8,6 +8,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") find_package(Git REQUIRED) +if (WIN32) + set(PYTHON_EXECUTABLE ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools/python.bat) +else (WIN32) + find_package(PythonInterp REQUIRED) +endif (WIN32) find_package(DepotTools REQUIRED) # @@ -59,7 +64,7 @@ set(LIBWEBRTC_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LI set(LIBWEBRTC_LIBRARY_PATH ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_LIB_DIR}/${LIBWEBRTC_LIBRARY_NAME}) set(LIBWEBRTC_BUILD_ROOT ${CMAKE_SOURCE_DIR}/src/out/Default) -set(LIBWEBRTC_CHROMIUM_DEPS https://github.com/aisouard/libwebrtc-chromium-deps.git) +set(LIBWEBRTC_CHROMIUM_DEPS https://github.com/aisouard/libwebrtc-chromium-deps/archive/e413140453b5b47a717d61695b4c607585279ce3.zip) add_subdirectory(Targets) diff --git a/Targets/WebRTC/CMakeLists.txt b/Targets/WebRTC/CMakeLists.txt index a2b5d7f..52148d6 100644 --- a/Targets/WebRTC/CMakeLists.txt +++ b/Targets/WebRTC/CMakeLists.txt @@ -2,9 +2,10 @@ include(Common) include(ExternalProject) ExternalProject_Add(chromium + URL ${LIBWEBRTC_CHROMIUM_DEPS} + URL_HASH MD5=0ad83a7a7ba20ef4af548578cbc893b7 SOURCE_DIR ${CMAKE_BINARY_DIR}/src/chromium/src - GIT_REPOSITORY ${LIBWEBRTC_CHROMIUM_DEPS} CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "")