From 2b1ba7b7caf2a01e1bd039cd758ddbec7a13b978 Mon Sep 17 00:00:00 2001
From: Sam Yates <yates@cscs.ch>
Date: Tue, 18 Apr 2017 12:38:05 +0200
Subject: [PATCH] Fail gracefully if git missing or broken. (#235)
Fixes #234.
* Adds dummy `DOWNLOAD_COMMAND` to `ExternalProject_Add` invocation.
* More thorough status/warning messages regarding git submodule update
process.
---
tests/ubench/CMakeLists.txt | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/ubench/CMakeLists.txt b/tests/ubench/CMakeLists.txt
index 0ccbe839..27e92ffb 100644
--- a/tests/ubench/CMakeLists.txt
+++ b/tests/ubench/CMakeLists.txt
@@ -20,15 +20,30 @@ set(gbench_cmake_args
# Attempt to update git submodule if required.
find_package(Git)
if(NOT EXISTS "${gbench_src_dir}/.git")
+ set(git_failed)
if(GIT_FOUND)
- exec_program("${GIT_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}"
- ARGS submodule update --init google-benchmark)
+ message(STATUS "Updating the google-benchmark submodule ${gbench_src_dir}")
+ execute_process(
+ COMMAND "${GIT_EXECUTABLE}" submodule update --init "${gbench_src_dir}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ ERROR_VARIABLE git_error
+ RESULT_VARIABLE git_result)
+ if(NOT git_result EQUAL 0)
+ set(git_failed "${git_error}")
+ endif()
else()
- message(WARNING "Unable to update the google-benchmark submodule: git not found.")
+ set(git_failed "git not found")
+ endif()
+
+ if(git_failed)
+ message(WARNING "Unable to update the google-benchmark submodule: ${git_failed}")
endif()
endif()
ExternalProject_Add(gbench
+ # Add dummy DOWNLOAD_COMMAND to stop ExternalProject_Add terminating CMake if the
+ # git submodule had not been udpated.
+ DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E echo "Warning: ${gbench_src_dir} empty or missing."
SOURCE_DIR "${gbench_src_dir}"
CMAKE_ARGS "${gbench_cmake_args}"
INSTALL_DIR "${gbench_install_dir}"
--
GitLab