[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1507-g4ffd78e
Stephen Kelly
steveire at gmail.com
Thu Mar 27 18:14:59 EDT 2014
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 4ffd78e2709a3639b079bd6d8863472b83b0da3c (commit)
via dd96bd65d86c1f0ca3d2a8a435103a43f6d87bc3 (commit)
via a9143928968164d0b8c1ccc9918549f55c33a270 (commit)
via c205e44f111fd18fdddfb1870a061e5a383b3f3d (commit)
via 3190bfbf58a31f13ba7f06ed9aba0cc97d11f318 (commit)
from 4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1 (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=4ffd78e2709a3639b079bd6d8863472b83b0da3c
commit 4ffd78e2709a3639b079bd6d8863472b83b0da3c
Merge: 4c0b1e3 dd96bd6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 18:14:58 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 27 18:14:58 2014 -0400
Merge topic 'target-sources-refactor' into next
dd96bd65 Change the diagnostic message.
a9143928 cmSourceFileLocation: Collapse full path for directory comparisons.
c205e44f cmSourceFileLocation: Remove unused Update method.
3190bfbf Revert "cmSourceFileLocation: Normalize compared directories."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd96bd65d86c1f0ca3d2a8a435103a43f6d87bc3
commit dd96bd65d86c1f0ca3d2a8a435103a43f6d87bc3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 23:14:23 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 27 23:14:23 2014 +0100
Change the diagnostic message.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index b90d094..95227d2 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1254,9 +1254,9 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
if (!context->EvaluateForBuildsystem)
{
cmOStringStream e;
- e << "The TARGET_OBJECTS generator expression may only be evaluated "
- "by cmake itself. It may not be evaluated by file(GENERATE), "
- "install(FILES) etc.";
+ e << "The evaluation of the TARGET_OBJECTS generator expression "
+ "is only suitable for consumption by CMake. It is not suitable "
+ "for writing out elsewhere.";
reportError(context, content->GetOriginalExpression(), e.str());
return std::string();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9143928968164d0b8c1ccc9918549f55c33a270
commit a9143928968164d0b8c1ccc9918549f55c33a270
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 22:56:36 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 27 23:11:32 2014 +0100
cmSourceFileLocation: Collapse full path for directory comparisons.
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 24e646f..c050202 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -60,6 +60,11 @@ cmSourceFileLocation
this->AmbiguousDirectory = !cmSystemTools::FileIsFullPath(name.c_str());
this->AmbiguousExtension = true;
this->Directory = cmSystemTools::GetFilenamePath(name);
+ if (cmSystemTools::FileIsFullPath(this->Directory.c_str()))
+ {
+ this->Directory
+ = cmSystemTools::CollapseFullPath(this->Directory.c_str());
+ }
this->Name = cmSystemTools::GetFilenameName(name);
this->UpdateExtension(name);
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c205e44f111fd18fdddfb1870a061e5a383b3f3d
commit c205e44f111fd18fdddfb1870a061e5a383b3f3d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 23:09:39 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 27 23:10:24 2014 +0100
cmSourceFileLocation: Remove unused Update method.
The string overload is never called. This allows the removal of
the unused UpdateDirectory method.
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 3e78b29..24e646f 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -65,19 +65,6 @@ cmSourceFileLocation
}
//----------------------------------------------------------------------------
-void cmSourceFileLocation::Update(const std::string& name)
-{
- if(this->AmbiguousDirectory)
- {
- this->UpdateDirectory(name);
- }
- if(this->AmbiguousExtension)
- {
- this->UpdateExtension(name);
- }
-}
-
-//----------------------------------------------------------------------------
void cmSourceFileLocation::Update(cmSourceFileLocation const& loc)
{
if(this->AmbiguousDirectory && !loc.AmbiguousDirectory)
@@ -176,17 +163,6 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name)
}
//----------------------------------------------------------------------------
-void cmSourceFileLocation::UpdateDirectory(const std::string& name)
-{
- // If a full path was given we know the directory.
- if(cmSystemTools::FileIsFullPath(name.c_str()))
- {
- this->Directory = cmSystemTools::GetFilenamePath(name);
- this->AmbiguousDirectory = false;
- }
-}
-
-//----------------------------------------------------------------------------
bool
cmSourceFileLocation
::MatchesAmbiguousExtension(cmSourceFileLocation const& loc) const
diff --git a/Source/cmSourceFileLocation.h b/Source/cmSourceFileLocation.h
index 82a62ab..c37fb1d 100644
--- a/Source/cmSourceFileLocation.h
+++ b/Source/cmSourceFileLocation.h
@@ -96,9 +96,7 @@ private:
// Update the location with additional knowledge.
void Update(cmSourceFileLocation const& loc);
- void Update(const std::string& name);
void UpdateExtension(const std::string& name);
- void UpdateDirectory(const std::string& name);
};
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3190bfbf58a31f13ba7f06ed9aba0cc97d11f318
commit 3190bfbf58a31f13ba7f06ed9aba0cc97d11f318
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 27 22:55:32 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 27 23:01:43 2014 +0100
Revert "cmSourceFileLocation: Normalize compared directories."
This reverts commit e081db393891a75aeaf84adfc663e352622d3e93.
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index d31af89..3e78b29 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -225,13 +225,6 @@ cmSourceFileLocation
return false;
}
-static bool isSameDirectory(std::string const& dir1, std::string const& dir2)
-{
- std::string norm1 = cmsys::SystemTools::GetRealPath(dir1.c_str());
- std::string norm2 = cmsys::SystemTools::GetRealPath(dir2.c_str());
- return norm1 == norm2;
-}
-
//----------------------------------------------------------------------------
bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
{
@@ -274,7 +267,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
if(!this->AmbiguousDirectory && !loc.AmbiguousDirectory)
{
// Both sides have absolute directories.
- if(!isSameDirectory(this->Directory, loc.Directory))
+ if(this->Directory != loc.Directory)
{
return false;
}
@@ -283,7 +276,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
this->Makefile == loc.Makefile)
{
// Both sides have directories relative to the same location.
- if(!isSameDirectory(this->Directory, loc.Directory))
+ if(this->Directory != loc.Directory)
{
return false;
}
@@ -310,8 +303,8 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
std::string binDir =
cmSystemTools::CollapseFullPath(
this->Directory.c_str(), this->Makefile->GetCurrentOutputDirectory());
- if(!isSameDirectory(srcDir, loc.Directory) &&
- !isSameDirectory(binDir, loc.Directory))
+ if(srcDir != loc.Directory &&
+ binDir != loc.Directory)
{
return false;
}
@@ -325,8 +318,8 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
std::string binDir =
cmSystemTools::CollapseFullPath(
loc.Directory.c_str(), loc.Makefile->GetCurrentOutputDirectory());
- if(!isSameDirectory(srcDir, this->Directory) &&
- !isSameDirectory(binDir, this->Directory))
+ if(srcDir != this->Directory &&
+ binDir != this->Directory)
{
return false;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 6 ++--
Source/cmSourceFileLocation.cxx | 48 +++++++----------------------
Source/cmSourceFileLocation.h | 2 --
3 files changed, 14 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list