[Cmake-commits] CMake branch, next, updated. v3.5.2-1220-g8303318
Brad King
brad.king at kitware.com
Tue May 3 10:04:51 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8303318b7f3ff9fe892e3d5e519b37130ae40052 (commit)
via 79410eeb1f32974aaf1e95aef439a4709fafbc8e (commit)
from ec946b2b4e66b327d9dbdebf7622cf3e81f64064 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8303318b7f3ff9fe892e3d5e519b37130ae40052
commit 8303318b7f3ff9fe892e3d5e519b37130ae40052
Merge: ec946b2 79410ee
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 10:04:50 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 3 10:04:50 2016 -0400
Merge topic 'ExternalProject-git-recursive-init' into next
79410eeb ExternalProject: Initialize Git submodules recursively and on update (#16083)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79410eeb1f32974aaf1e95aef439a4709fafbc8e
commit 79410eeb1f32974aaf1e95aef439a4709fafbc8e
Author: Ilya Kulakov <kulakov.ilya at gmail.com>
AuthorDate: Tue Apr 26 18:50:38 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:04:37 2016 -0400
ExternalProject: Initialize Git submodules recursively and on update (#16083)
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
)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list