diff --git a/CMakeLists.txt b/CMakeLists.txt index c282e60..ffee487 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,6 @@ set(_WEBRTC_CMAKE_ARGS -DTARGET_OS=${TARGET_OS} -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) set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DWEBRTC_BRANCH_HEAD=${WEBRTC_BRANCH_HEAD}) endif (WEBRTC_BRANCH_HEAD) diff --git a/CMakeModules/Gn.cmake b/CMakeModules/Gn.cmake index 9152904..4b5edf1 100644 --- a/CMakeModules/Gn.cmake +++ b/CMakeModules/Gn.cmake @@ -11,12 +11,6 @@ else (MSVC OR XCODE) set(_NINJA_BUILD_DIR out/Release) 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) set(_GEN_ARGS ${_GEN_ARGS} ${GN_EXTRA_ARGS}) endif (GN_EXTRA_ARGS) diff --git a/CMakeModules/Options.cmake b/CMakeModules/Options.cmake index caecfb6..600b9dc 100644 --- a/CMakeModules/Options.cmake +++ b/CMakeModules/Options.cmake @@ -1,6 +1,5 @@ # # Options, flags -option(BUILD_TESTS "Build test binaries" OFF) option(BUILD_SAMPLE "Build sample" OFF) 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") diff --git a/appveyor.yml b/appveyor.yml index 695b1d1..692fb8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ before_build: - cd c:\projects\libwebrtc - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - 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: project: PACKAGE.vcxproj diff --git a/webrtc/CMakeLists.txt.in b/webrtc/CMakeLists.txt.in index 3f23caa..3367c9e 100644 --- a/webrtc/CMakeLists.txt.in +++ b/webrtc/CMakeLists.txt.in @@ -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) -if (BUILD_TESTS) - set(_NINJA_COMMAND ${_NINJA_COMMAND} webrtc_tests) -endif (BUILD_TESTS) - libwebrtc_command( NAME webrtc-build COMMAND ${_NINJA_COMMAND}