From 470e444791109e744ee6f0cd630838aba354fbe7 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sun, 12 Mar 2017 12:16:19 +0100 Subject: [PATCH] Find git and depot_tools in the main file --- CMakeLists.txt | 9 +++++++++ CMakeModules/FindLibraries.cmake | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd51901..1235a67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,15 @@ cmake_policy(SET CMP0057 NEW) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules) +find_package(Git REQUIRED) +find_package(DepotTools REQUIRED) + +if (WIN32) + set(PYTHON_EXECUTABLE ${DEPOTTOOLS_PATH}/python.bat) +else (WIN32) + find_package(PythonInterp REQUIRED) +endif (WIN32) + include(FindLibraries) include(Version) include(Options) diff --git a/CMakeModules/FindLibraries.cmake b/CMakeModules/FindLibraries.cmake index 8a29977..20e15ba 100644 --- a/CMakeModules/FindLibraries.cmake +++ b/CMakeModules/FindLibraries.cmake @@ -1,15 +1,5 @@ # # Find required packages - -find_package(Git REQUIRED) -find_package(DepotTools REQUIRED) - -if (WIN32) - set(PYTHON_EXECUTABLE ${DEPOTTOOLS_PATH}/python.bat) -else (WIN32) - find_package(PythonInterp REQUIRED) -endif (WIN32) - list(APPEND LIBWEBRTC_LIBRARIES webrtc) if (UNIX AND NOT APPLE)