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 aa2407c8bcc1a014f1b8730b84fa9cd1b1a2cc22 (commit)
via 84d124e8f02d5bba60d3491d4c5d7cb68aa91192 (commit)
from a803eac6cee0e79c96495780b5b0b57515a2af93 (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=aa2407c8bcc1a014f1b8730b84fa9cd1b1a2cc22
commit aa2407c8bcc1a014f1b8730b84fa9cd1b1a2cc22
Merge: a803eac 84d124e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 26 17:10:20 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 26 17:10:20 2014 -0500
Merge topic 'fix-source-case-matching' into next
84d124e8 Fix lookup of source names after conversion to their actual case
(#15259)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84d124e8f02d5bba60d3491d4c5d7cb68aa91192
commit 84d124e8f02d5bba60d3491d4c5d7cb68aa91192
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 26 16:14:49 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 26 17:03:40 2014 -0500
Fix lookup of source names after conversion to their actual case (#15259)
Since commit v3.1.0-rc1~688^2~15 (cmTarget: Add a method to obtain list of
filenames for sources, 2014-03-17) we have code paths that lookup sources by
strings containing their own full path after normalization to the actual
case
on disk. This fails in the case that a cmSourceFile has already been
created
with a different case in the filename. The comparison of the directory
works
because it is always normalized. Only the comparison of the file name
fails.
Fix this by using a case-insensitive comparison of source file names on
platforms that do not have case-sensitive filesystems.
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 1c2454e..004fd1f 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -216,7 +216,8 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation
const& loc)
// Both extensions are similarly ambiguous. Since only the old fixed set
// of extensions will be tried, the names must match at this point to be
// the same file.
- if(this->Name.size() != loc.Name.size() || this->Name != loc.Name)
+ if(this->Name.size() != loc.Name.size() ||
+ !cmSystemTools::ComparePath(this->Name, loc.Name))
{
return false;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmSourceFileLocation.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
