diff --git a/CMakeLists.txt b/CMakeLists.txt
index 770086e..bdd574b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,16 @@ if (CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_CONFIGURATION_TYPES Debug Release)
 endif (CMAKE_CONFIGURATION_TYPES)
 
+#
+# Required packages
 find_package(Git REQUIRED)
+find_package(DepotTools REQUIRED)
+
 if (WIN32)
   set(PYTHON_EXECUTABLE ${CMAKE_SOURCE_DIR}/depot_tools/python.bat)
 else (WIN32)
   find_package(PythonInterp REQUIRED)
 endif (WIN32)
-find_package(DepotTools REQUIRED)
 
 #
 # Set the project's version
diff --git a/CMakeModules/FindDepotTools.cmake b/CMakeModules/FindDepotTools.cmake
index 9bf5569..e208475 100644
--- a/CMakeModules/FindDepotTools.cmake
+++ b/CMakeModules/FindDepotTools.cmake
@@ -1,14 +1,16 @@
-if (WIN32)
-  find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE
-               NAMES gclient.bat
-               PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools)
-else (WIN32)
-  find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE
-               NAMES gclient
-               PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools)
-endif (WIN32)
+find_program(DEPOTTOOLS_GCLIENT_EXECUTABLE
+             NAMES gclient gclient.bat
+             PATHS ${CMAKE_CURRENT_SOURCE_DIR}/depot_tools)
+
+find_path(DEPOTTOOLS_PATH
+          NAMES gclient gclient.py gclient.bat
+                gn gn.py gn.bat
+                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)
 find_package_handle_standard_args(DepotTools
                                   REQUIRED_VARS DEPOTTOOLS_GCLIENT_EXECUTABLE
-                                  FAIL_MESSAGE "Could not find the gclient executable.")
\ No newline at end of file
+                                  FAIL_MESSAGE "Could not find the gclient executable.")