[Cmake-commits] CMake branch, next, updated. v3.5.1-775-g128278a

Brad King brad.king at kitware.com
Fri Apr 1 10:15:20 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  128278a644e91110672cd0a3579478dcc1b32d96 (commit)
       via  102a40f156eaf989ccb333d4949d788491a9baf9 (commit)
      from  c34d7353a1e05cc766394691d166daeac01c84e6 (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=128278a644e91110672cd0a3579478dcc1b32d96
commit 128278a644e91110672cd0a3579478dcc1b32d96
Merge: c34d735 102a40f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 1 10:15:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 1 10:15:07 2016 -0400

    Merge topic 'ctest-run-submodule-sync' into next
    
    102a40f1 fixup! cmCTestGIT: add an option to initialize submodules on update


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=102a40f156eaf989ccb333d4949d788491a9baf9
commit 102a40f156eaf989ccb333d4949d788491a9baf9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 1 10:14:51 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 1 10:14:51 2016 -0400

    fixup! cmCTestGIT: add an option to initialize submodules on update

diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index ede4b78..1179f56 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -593,7 +593,7 @@ Configuration settings to specify the version control tool include:
   If set, CTest will update the repository's submodules before updating.
 
   * `CTest Script`_ variable: :variable:`CTEST_GIT_INIT_SUBMODULES`
-  * :module:`CTest` module variable: ``GIT_INIT_SUBMODULES``
+  * :module:`CTest` module variable: ``CTEST_GIT_INIT_SUBMODULES``
 
 ``GITUpdateCustom``
   Specify a custom command line (as a semicolon-separated list) to run
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index c2341c9..0ff2eed 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -52,7 +52,7 @@ SVNUpdateOptions: @SVN_UPDATE_OPTIONS@
 
 # Git options
 GITCommand: @GITCOMMAND@
-GITInitSubmodules: @GIT_INIT_SUBMODULES@
+GITInitSubmodules: @CTEST_GIT_INIT_SUBMODULES@
 GITUpdateOptions: @GIT_UPDATE_OPTIONS@
 GITUpdateCustom: @CTEST_GIT_UPDATE_CUSTOM@
 

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/ctest.1.rst          |    2 +-
 Modules/DartConfiguration.tcl.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list