[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1721-g30d6713
Brad King
brad.king at kitware.com
Wed Jan 23 10:52:16 EST 2013
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 30d6713e9a6a797d6d0597b255faa5fb117ab891 (commit)
via 3853a6c3a7210c29f82fd27f9d2f6e99eb18e1ba (commit)
from 92bd826c214da93726e7a3186009a2993a7ef327 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30d6713e9a6a797d6d0597b255faa5fb117ab891
commit 30d6713e9a6a797d6d0597b255faa5fb117ab891
Merge: 92bd826 3853a6c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 23 10:52:12 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 23 10:52:12 2013 -0500
Merge topic 'cmMakefile-comment-typos' into next
3853a6c spell: fix a few typos in comments
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3853a6c3a7210c29f82fd27f9d2f6e99eb18e1ba
commit 3853a6c3a7210c29f82fd27f9d2f6e99eb18e1ba
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Tue Jan 22 06:44:08 2013 +0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 23 10:51:31 2013 -0500
spell: fix a few typos in comments
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b432986..d1dc5a2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2243,7 +2243,7 @@ bool cmMakefile::CanIWriteThisFile(const char* fileName)
{
return true;
}
- // If we are doing an in-source build, than the test will always fail
+ // If we are doing an in-source build, then the test will always fail
if ( cmSystemTools::SameFile(this->GetHomeDirectory(),
this->GetHomeOutputDirectory()) )
{
@@ -2254,8 +2254,8 @@ bool cmMakefile::CanIWriteThisFile(const char* fileName)
return true;
}
- // Check if this is subdirectory of the source tree but not a
- // subdirectory of a build tree
+ // Check if this is a subdirectory of the source tree but not a
+ // subdirectory of the build tree
if ( cmSystemTools::IsSubDirectory(fileName,
this->GetHomeDirectory()) &&
!cmSystemTools::IsSubDirectory(fileName,
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list