CMake: Better steps

This commit is contained in:
Axel Isouard 2016-11-26 16:10:13 +01:00
parent d230f08a2c
commit c38445b4aa
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
3 changed files with 10 additions and 4 deletions

View file

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

View file

@ -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)

View file

@ -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 "")