UltraCoder/libwebrtc
1
0
Fork 0
mirror of https://github.com/UltraCoderRU/libwebrtc.git synced 2026-01-28 11:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enhance FindDepotTools.cmake, include it before looking for Python

Browse source
This commit is contained in:
Axel Isouard 2017-02-05 06:14:42 -08:00
parent 704267abcb
commit 29b4333904
No known key found for this signature in database
GPG key ID: D30914735883C824
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -9,13 +9,16 @@ if (CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES Debug Release) set(CMAKE_CONFIGURATION_TYPES Debug Release)
endif (CMAKE_CONFIGURATION_TYPES) endif (CMAKE_CONFIGURATION_TYPES)
#
# Required packages
find_package(Git REQUIRED) find_package(Git REQUIRED)
find_package(DepotTools REQUIRED)
if (WIN32) if (WIN32)
set(PYTHON_EXECUTABLE ${CMAKE_SOURCE_DIR}/depot_tools/python.bat) set(PYTHON_EXECUTABLE ${CMAKE_SOURCE_DIR}/depot_tools/python.bat)
else (WIN32) else (WIN32)
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)
endif (WIN32) endif (WIN32)
find_package(DepotTools REQUIRED)
# #
# Set the project's version # Set the project's version

16
CMakeModules/FindDepotTools.cmake
View file

@ -1,12 +1,14 @@
if (WIN32)
find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE
NAMES gclient.bat NAMES gclient gclient.bat
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools) PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools)
else (WIN32)
find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE find_path(DEPOTTOOLS_PATH
NAMES gclient NAMES gclient gclient.py gclient.bat
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools) gn gn.py gn.bat
endif (WIN32) ninja ninja.exe ninja-linux32 ninja-linux64 ninja-mac
download_from_google_storage download_from_google_storage.bat
download_from_google_storage.py
HINTS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools)
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(DepotTools find_package_handle_standard_args(DepotTools