UltraCoder/libwebrtc
1
0
Fork 0
mirror of https://github.com/UltraCoderRU/libwebrtc.git synced 2026-01-28 03:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove BUILD_TESTS option

Browse source
This commit is contained in:
Martin Müllenhaupt 2018-05-30 11:33:02 +02:00
parent a627d1bc9a
commit 2e92e72f0a
5 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -60,10 +60,6 @@ set(_WEBRTC_CMAKE_ARGS
-DTARGET_OS=${TARGET_OS} -DTARGET_OS=${TARGET_OS}
-DWEBRTC_PARENT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc) -DWEBRTC_PARENT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc)
if (BUILD_TESTS)
set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DBUILD_TESTS=${BUILD_TESTS})
endif (BUILD_TESTS)
if (WEBRTC_BRANCH_HEAD) if (WEBRTC_BRANCH_HEAD)
set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DWEBRTC_BRANCH_HEAD=${WEBRTC_BRANCH_HEAD}) set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DWEBRTC_BRANCH_HEAD=${WEBRTC_BRANCH_HEAD})
endif (WEBRTC_BRANCH_HEAD) endif (WEBRTC_BRANCH_HEAD)

6
CMakeModules/Gn.cmake
View file

@ -11,12 +11,6 @@ else (MSVC OR XCODE)
set(_NINJA_BUILD_DIR out/Release) set(_NINJA_BUILD_DIR out/Release)
endif (MSVC OR XCODE) endif (MSVC OR XCODE)
if (BUILD_TESTS)
set(_GEN_ARGS ${_GEN_ARGS} rtc_include_tests=true)
else (BUILD_TESTS)
set(_GEN_ARGS ${_GEN_ARGS} rtc_include_tests=false)
endif (BUILD_TESTS)
if (GN_EXTRA_ARGS) if (GN_EXTRA_ARGS)
set(_GEN_ARGS ${_GEN_ARGS} ${GN_EXTRA_ARGS}) set(_GEN_ARGS ${_GEN_ARGS} ${GN_EXTRA_ARGS})
endif (GN_EXTRA_ARGS) endif (GN_EXTRA_ARGS)

1
CMakeModules/Options.cmake
View file

@ -1,6 +1,5 @@
# #
# Options, flags # Options, flags
option(BUILD_TESTS "Build test binaries" OFF)
option(BUILD_SAMPLE "Build sample" OFF) option(BUILD_SAMPLE "Build sample" OFF)
set(DEPOT_TOOLS_PATH "" CACHE STRING "Path to your own depot_tools directory") set(DEPOT_TOOLS_PATH "" CACHE STRING "Path to your own depot_tools directory")
set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass before compiling WebRTC") set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass before compiling WebRTC")

2
appveyor.yml
View file

@ -17,7 +17,7 @@ before_build:
- cd c:\projects\libwebrtc - cd c:\projects\libwebrtc
- if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017
- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64
- cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/66 -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/66 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
build: build:
project: PACKAGE.vcxproj project: PACKAGE.vcxproj

4
webrtc/CMakeLists.txt.in
View file

@ -146,10 +146,6 @@ libwebrtc_command(
set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} pc:peerconnection system_wrappers:field_trial_default system_wrappers:metrics_default jsoncpp) set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} pc:peerconnection system_wrappers:field_trial_default system_wrappers:metrics_default jsoncpp)
if (BUILD_TESTS)
set(_NINJA_COMMAND ${_NINJA_COMMAND} webrtc_tests)
endif (BUILD_TESTS)
libwebrtc_command( libwebrtc_command(
NAME webrtc-build NAME webrtc-build
COMMAND ${_NINJA_COMMAND} COMMAND ${_NINJA_COMMAND}