summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-05-03 14:17:02 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-05-03 14:17:02 (GMT)
commite053510efa72fe4c4e647ccd9e9168d0e187ffd2 (patch)
tree2837dff30290a6399fb5a8bef3d989965794c9ff /Modules
parent3fc49c50b0a62ab66376b624d1d38e30ffbbc4dd (diff)
parent79410eeb1f32974aaf1e95aef439a4709fafbc8e (diff)
downloadCMake-e053510efa72fe4c4e647ccd9e9168d0e187ffd2.zip
CMake-e053510efa72fe4c4e647ccd9e9168d0e187ffd2.tar.gz
CMake-e053510efa72fe4c4e647ccd9e9168d0e187ffd2.tar.bz2
Merge topic 'ExternalProject-git-recursive-init'
79410eeb ExternalProject: Initialize Git submodules recursively and on update (#16083)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 9cc8a20..7dad6e5 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -587,7 +587,7 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive ${git_submodules}
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -833,7 +833,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" submodule update --recursive ${git_submodules}
+ COMMAND \"${git_EXECUTABLE}\" submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)