diff --git a/CMakeLists.txt b/CMakeLists.txt index 00c466c..0088fa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,18 +10,18 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} find_package(Git REQUIRED) -if (DEPOT_TOOLS_PATH) - find_package(DepotTools REQUIRED) -endif (DEPOT_TOOLS_PATH) - -if (NOT WIN32) - find_package(PythonInterp 2.7 REQUIRED) -endif (NOT WIN32) - include(FindLibraries) include(Version) include(Options) include(TargetOsAndCpu) +if (HAS_OWN_DEPOT_TOOLS) + find_package(DepotTools REQUIRED) +endif (HAS_OWN_DEPOT_TOOLS) + +if (NOT WIN32) + find_package(PythonInterp 2.7 REQUIRED) +endif (NOT WIN32) + add_subdirectory(Targets) export(PACKAGE LibWebRTC) diff --git a/CMakeModules/FindDepotTools.cmake b/CMakeModules/FindDepotTools.cmake index 6b2c258..c23d4eb 100644 --- a/CMakeModules/FindDepotTools.cmake +++ b/CMakeModules/FindDepotTools.cmake @@ -1,8 +1,3 @@ -if(FIND_DEPOT_TOOLS_INCLUDED) - return() -endif(FIND_DEPOT_TOOLS_INCLUDED) -set(FIND_DEPOT_TOOLS_INCLUDED true) - find_program(GCLIENT_EXECUTABLE NAMES gclient gclient.bat DOC "Path to gclient executable" diff --git a/CMakeModules/Options.cmake b/CMakeModules/Options.cmake index 219bc3b..1833223 100644 --- a/CMakeModules/Options.cmake +++ b/CMakeModules/Options.cmake @@ -13,6 +13,10 @@ option(BUILD_SHARED_LIB "Build WebRTC as a shared library" OFF) set(WEBRTC_REVISION "" CACHE STRING "WebRTC commit hash to checkout") set(WEBRTC_BRANCH_HEAD "${LIBWEBRTC_WEBRTC_HEAD}" CACHE STRING "WebRTC branch head to checkout") +if (DEPOT_TOOLS_PATH) + set(HAS_OWN_DEPOT_TOOLS 1) +endif (DEPOT_TOOLS_PATH) + if(BUILD_SHARED_LIB) set(LIBRARY_TYPE SHARED) else()