From be0f1082987f099f8ff6544c317be94e76329567 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sun, 25 Sep 2016 19:22:50 +0200 Subject: [PATCH] Do not disable WebRTC examples anymore since it's not required to do so --- Targets/Build/CMakeLists.txt | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/Targets/Build/CMakeLists.txt b/Targets/Build/CMakeLists.txt index 37ade67..c76ad4a 100644 --- a/Targets/Build/CMakeLists.txt +++ b/Targets/Build/CMakeLists.txt @@ -14,11 +14,6 @@ if(NOT BUILD_TESTS) set(LIBWEBRTC_GEN_ARGS ${LIBWEBRTC_GEN_ARGS} rtc_include_tests=false) endif(NOT BUILD_TESTS) -set(GENERATE_BUILD_DEPENDENCY libwebrtc_patch) -if(NOT BUILD_EXAMPLES) - set(GENERATE_BUILD_DEPENDENCY libwebrtc_links) -endif(NOT BUILD_EXAMPLES) - set(GENERATE_COMMAND ${LIBWEBRTC_ENV_COMMAND} gn gen out/Default --args='${LIBWEBRTC_GEN_ARGS}') @@ -27,34 +22,13 @@ add_libwebrtc_command(libwebrtc_generate_build "${GENERATE_COMMAND}" ${CMAKE_BINARY_DIR}/src "Generate build files" - ${GENERATE_BUILD_DEPENDENCY} + libwebrtc_links ) -# -# Revert examples -# - -if(NOT BUILD_EXAMPLES) - set(PATCH_COMMAND sed -i "s/'include_examples%': 0/'include_examples%': 1/g" src/all.gyp) - - add_libwebrtc_command(libwebrtc_revert - None - "${PATCH_COMMAND}" - ${CMAKE_BINARY_DIR} - "Reverting build definitions" - libwebrtc_generate_build - ) -endif(NOT BUILD_EXAMPLES) - # # Run ninja # -set(NINJA_DEPENDENCY libwebrtc_generate_build) -if(NOT BUILD_EXAMPLES) - set(GENERATE_BUILD_DEPENDENCY libwebrtc_revert) -endif(NOT BUILD_EXAMPLES) - set(BUILD_WEBRTC_COMMAND ${LIBWEBRTC_ENV_COMMAND} ninja -C out/Default libjingle_peerconnection) @@ -63,7 +37,7 @@ add_libwebrtc_command(libwebrtc_build "${BUILD_WEBRTC_COMMAND}" ${CMAKE_BINARY_DIR}/src "Build WebRTC" - ${NINJA_DEPENDENCY} + libwebrtc_generate_build ) #