[Cmake-commits] CMake branch, next, updated. v2.8.3-1363-g5cbfd2d

[Brad King]

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  5cbfd2dff81fcabef03c4a1da58fa46dbccd1eb0 (commit)
       via  9cefce09f63ebb19621e061a30fd5838ac834d0b (commit)
      from  35bb90663abd7b501adf8f114e1f2364988e955d (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=5cbfd2dff81fcabef03c4a1da58fa46dbccd1eb0
commit 5cbfd2dff81fcabef03c4a1da58fa46dbccd1eb0
Merge: 35bb906 9cefce0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 15 08:02:16 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 15 08:02:16 2011 -0500

    Merge topic 'missing-file-dir-issue-11677' into next
    
    9cefce0 Report directory with missing source file (#11677)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cefce09f63ebb19621e061a30fd5838ac834d0b
commit 9cefce09f63ebb19621e061a30fd5838ac834d0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 15 08:00:11 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 15 08:00:11 2011 -0500

    Report directory with missing source file (#11677)
    
    Previously the error message for code like
    
      add_executable(myexe does_not_exist/mysrc.c)
    
    mentioned only that "mysrc.c" is not found.  Report the directory too.

diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 26328cf..de7ff02 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -187,8 +187,13 @@ bool cmSourceFile::FindFullPath(std::string* error)
     }
 
   cmOStringStream e;
-  e << "Cannot find source file \"" << this->Location.GetName() << "\"";
-  e << ".  Tried extensions";
+  std::string missing = this->Location.GetDirectory();
+  if(!missing.empty())
+    {
+    missing += "/";
+    }
+  missing += this->Location.GetName();
+  e << "Cannot find source file:\n  " << missing << "\nTried extensions";
   for(std::vector<std::string>::const_iterator ext = srcExts.begin();
       ext != srcExts.end(); ++ext)
     {

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

Summary of changes:
 Source/cmSourceFile.cxx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake