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 b129f20547e849650e9aee1b3b2b0a6835c748e2 (commit) via 1f8613e9bab142a839ec3c4dafd1aff1ba7487c7 (commit) via 385e6a274da286befb38a0d540845383f393b79f (commit) from 579af61dae6e3346891f1b53f806d7889335364a (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=b129f20547e849650e9aee1b3b2b0a6835c748e2 commit b129f20547e849650e9aee1b3b2b0a6835c748e2 Merge: 579af61 1f8613e Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Sep 13 14:01:45 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Sep 13 14:01:45 2016 -0400 Merge topic 'ctest-subdir-spaces' into next 1f8613e9 Fix CTest test file generation for spaces in subdirectory names 385e6a27 cmLocalGenerator: Refactor test subdirectory generation loop https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f8613e9bab142a839ec3c4dafd1aff1ba7487c7 commit 1f8613e9bab142a839ec3c4dafd1aff1ba7487c7 Author: Stefano Soffia <stefano.soffia...@gmail.com> AuthorDate: Mon Sep 12 23:01:50 2016 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Sep 13 13:58:46 2016 -0400 Fix CTest test file generation for spaces in subdirectory names Encode the subdirectory names properly for CMake syntax. Closes: #16299 diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index abe0c23..a76bed3 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -181,6 +181,7 @@ void cmLocalGenerator::GenerateTestFiles() // TODO: Use add_subdirectory instead? std::string outP = i->GetDirectory().GetCurrentBinary(); outP = this->ConvertToRelativePath(outP, START_OUTPUT); + outP = cmOutputConverter::EscapeForCMake(outP); fout << "subdirs(" << outP << ")" << std::endl; } } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=385e6a274da286befb38a0d540845383f393b79f commit 385e6a274da286befb38a0d540845383f393b79f Author: Stefano Soffia <stefano.soffia...@gmail.com> AuthorDate: Mon Sep 12 23:01:50 2016 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Sep 13 13:57:59 2016 -0400 cmLocalGenerator: Refactor test subdirectory generation loop diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c0ecba3..abe0c23 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -175,15 +175,13 @@ void cmLocalGenerator::GenerateTestFiles() (*gi)->Compute(this); (*gi)->Generate(fout, config, configurationTypes); } - size_t i; - std::vector<cmState::Snapshot> children = - this->Makefile->GetStateSnapshot().GetChildren(); - for (i = 0; i < children.size(); ++i) { + typedef std::vector<cmState::Snapshot> vec_t; + vec_t const& children = this->Makefile->GetStateSnapshot().GetChildren(); + for (vec_t::const_iterator i = children.begin(); i != children.end(); ++i) { // TODO: Use add_subdirectory instead? - fout << "subdirs("; - std::string outP = children[i].GetDirectory().GetCurrentBinary(); - fout << this->ConvertToRelativePath(outP, START_OUTPUT); - fout << ")" << std::endl; + std::string outP = i->GetDirectory().GetCurrentBinary(); + outP = this->ConvertToRelativePath(outP, START_OUTPUT); + fout << "subdirs(" << outP << ")" << std::endl; } } ----------------------------------------------------------------------- Summary of changes: Source/cmLocalGenerator.cxx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits