remove BUILD_TEST option and always build tests

This commit is contained in:
Martin Müllenhaupt 2017-02-03 12:17:32 +01:00
parent b2ed90417a
commit 6abc1de10a
2 changed files with 1 additions and 6 deletions

View file

@ -20,7 +20,6 @@ find_package(DepotTools REQUIRED)
# Options # Options
# #
option(BUILD_TESTS "Build test binaries" OFF)
option(BUILD_SAMPLES "Build samples binaries" OFF) option(BUILD_SAMPLES "Build samples binaries" OFF)
set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass before compiling WebRTC") set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass before compiling WebRTC")

View file

@ -104,7 +104,7 @@ endif (TARGET_OS STREQUAL "android")
# #
# Generate build files # Generate build files
# #
set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\") set(_GEN_ARGS use_gold=false rtc_include_tests=true target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\")
if (NOT CMAKE_BUILD_TYPE MATCHES DEBUG) if (NOT CMAKE_BUILD_TYPE MATCHES DEBUG)
set(_GEN_ARGS ${_GEN_ARGS} is_debug=false) set(_GEN_ARGS ${_GEN_ARGS} is_debug=false)
@ -112,10 +112,6 @@ elseif (NOT CMAKE_BUILD_TYPE MATCHES DEBUG)
set(_GEN_ARGS ${_GEN_ARGS} is_debug=true) set(_GEN_ARGS ${_GEN_ARGS} is_debug=true)
endif (NOT CMAKE_BUILD_TYPE MATCHES DEBUG) endif (NOT CMAKE_BUILD_TYPE MATCHES DEBUG)
if (NOT BUILD_TESTS)
set(_GEN_ARGS ${_GEN_ARGS} rtc_include_tests=false)
endif (NOT BUILD_TESTS)
if (WIN32) if (WIN32)
set(_GEN_ARGS ${_GEN_ARGS}) set(_GEN_ARGS ${_GEN_ARGS})
set(_GEN_COMMAND gn gen out/Default --args="${_GEN_ARGS}") set(_GEN_COMMAND gn gen out/Default --args="${_GEN_ARGS}")