diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-03 14:17:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-03 14:17:02 (GMT) |
| commit | e053510efa72fe4c4e647ccd9e9168d0e187ffd2 (patch) | |
| tree | 2837dff30290a6399fb5a8bef3d989965794c9ff | |
| parent | 3fc49c50b0a62ab66376b624d1d38e30ffbbc4dd (diff) | |
| parent | 79410eeb1f32974aaf1e95aef439a4709fafbc8e (diff) | |
| download | CMake-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)
| -rw-r--r-- | Help/release/dev/ExternalProject-git-recursive-init.rst | 7 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Help/release/dev/ExternalProject-git-recursive-init.rst b/Help/release/dev/ExternalProject-git-recursive-init.rst new file mode 100644 index 0000000..1ebcced --- /dev/null +++ b/Help/release/dev/ExternalProject-git-recursive-init.rst @@ -0,0 +1,7 @@ +ExternalProject-git-recursive-init +---------------------------------- + +* The :module:`ExternalProject` module learned to initialize Git submodules + recursively and also to initialize new submodules on updates. Use the + ``GIT_SUBMODULES`` option to restrict which submodules are initalized and + updated. 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 ) |