[Cmake-commits] CMake branch, next, updated. v3.5.2-1184-gdb3f24a

Brad King brad.king at kitware.com
Mon May 2 13:27:50 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  db3f24a97b988bebe75210d8ca53a7cef19ff134 (commit)
       via  6a9056781ae761e6efa07b033271ccdf818472c8 (commit)
      from  f80f30d3a1d3cdb669fe6405e2971ae038af1829 (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=db3f24a97b988bebe75210d8ca53a7cef19ff134
commit db3f24a97b988bebe75210d8ca53a7cef19ff134
Merge: f80f30d 6a90567
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 13:27:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 2 13:27:50 2016 -0400

    Merge topic 'ExternalProject-git-recursive-init' into next
    
    6a905678 ExternalProject: Initialize Git submodules recursively and on update (#16083)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a9056781ae761e6efa07b033271ccdf818472c8
commit 6a9056781ae761e6efa07b033271ccdf818472c8
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: Mon May 2 13:26:38 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..10278d8
--- /dev/null
+++ b/Help/release/dev/ExternalProject-git-recursive-init.rst
@@ -0,0 +1,7 @@
+ExternalProject-git-recursive-init
+----------------------------------
+
+* The :command:`ctest_update` command learned to initialize 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:
 Help/release/dev/ExternalProject-git-recursive-init.rst |    7 +++++++
 Modules/ExternalProject.cmake                           |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/ExternalProject-git-recursive-init.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list