From 645ecc43e4529347fc658d887bdf23019d0412a6 Mon Sep 17 00:00:00 2001 From: Aaron Hinojosa <67hz@protonmail.com> Date: Mon, 27 Jul 2020 17:25:54 -0500 Subject: [PATCH] Update git submodules during build Making submodule init/update transparent to the end user. This change prevents CMake builds from failing if submodules have not been installed, e.g., Google Test. --- CMakeLists.txt | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d110d1bab..581fdf771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,8 +56,10 @@ else() set (SYNERGY_ADD_HEADERS TRUE) endif() + + set (libs) -include_directories (BEFORE SYSTEM ./ext/googletest/googletest/include) +include_directories (BEFORE SYSTEM ${PROJECT_SOURCE_DIR}/ext/googletest/googletest/include) if (UNIX) if (NOT APPLE) @@ -312,6 +314,32 @@ else() message (FATAL_ERROR "Couldn't find OpenSSL") endif() +# +# Check submodules +# +find_package(Git QUIET) +if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +# Update submodules as needed + option(GIT_SUBMODULE "Check submodules during build" ON) + if(GIT_SUBMODULE) + message(STATUS "Submodule update") + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if(NOT GIT_SUBMOD_RESULT EQUAL "0") + message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif() + endif() +endif() + +# +# Google Test +# +if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt") + message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") +endif() + + # # Configure_file... but for directories, recursively. #