diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
| commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
| tree | 819b5ca057d80b42699de219c982b7924857c406 /cmake/submodules.cmake | |
| parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
| parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
| download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'cmake/submodules.cmake')
| -rw-r--r-- | cmake/submodules.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmake/submodules.cmake b/cmake/submodules.cmake index 9f04c26e8d6..c8f7b3cc400 100644 --- a/cmake/submodules.cmake +++ b/cmake/submodules.cmake @@ -10,7 +10,12 @@ IF(GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git") WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE cmake_update_submodules RESULT_VARIABLE git_config_get_result) - IF(git_config_get_result EQUAL 128 OR cmake_update_submodules MATCHES no) + IF(cmake_update_submodules MATCHES no) + SET(update_result 0) + SET(SUBMODULE_UPDATE_CONFIG_MESSAGE +"\n\nTo update submodules automatically, set cmake.update-submodules to 'yes', or 'force' to update automatically: + ${GIT_EXECUTABLE} config cmake.update-submodules yes") + ELSEIF(git_config_get_result EQUAL 128) SET(update_result 0) ELSEIF (cmake_update_submodules MATCHES force) MESSAGE(STATUS "Updating submodules (forced)") @@ -31,7 +36,6 @@ ENDIF() IF(update_result OR NOT EXISTS ${CMAKE_SOURCE_DIR}/libmariadb/CMakeLists.txt) MESSAGE(FATAL_ERROR "No MariaDB Connector/C! Run - git submodule update --init --recursive -Then restart the build. -") + ${GIT_EXECUTABLE} submodule update --init --recursive +Then restart the build.${SUBMODULE_UPDATE_CONFIG_MESSAGE}") ENDIF() |