[Cmake-commits] CMake branch, next, updated. v3.5.1-736-g9f46f7b

Ben Boeckel ben.boeckel at kitware.com
Thu Mar 31 12:38:45 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  9f46f7bd489b1c74084c2062c15a9de2e8770cdd (commit)
       via  ffac85e06bf95b125d4fc954e898a70a02dd90df (commit)
      from  0d43a919fd720c76808fc9bcd617363ba97b41c5 (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=9f46f7bd489b1c74084c2062c15a9de2e8770cdd
commit 9f46f7bd489b1c74084c2062c15a9de2e8770cdd
Merge: 0d43a91 ffac85e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 31 12:38:44 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 31 12:38:44 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffac85e06bf95b125d4fc954e898a70a02dd90df
commit ffac85e06bf95b125d4fc954e898a70a02dd90df
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 31 12:38:13 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 31 12:38:13 2016 -0400

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

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 38eadad..1d6bdce 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -304,7 +304,7 @@ bool cmCTestGIT::UpdateImpl()
 
   std::string init_submodules =
     this->CTest->GetCTestConfiguration("GITInitSubmodules");
-  if (cmSystemTools::IsOn(init_submodules))
+  if (cmSystemTools::IsOn(init_submodules.c_str()))
     {
     char const* git_submodule_init[] = {git, "submodule", "init", 0};
     ret = this->RunChild(git_submodule_init, &submodule_out, &submodule_err,

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

Summary of changes:
 Source/CTest/cmCTestGIT.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list