[Cmake-commits] CMake branch, next, updated. v2.8.1-1443-g2ba2e10

[David Cole]

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  2ba2e108e8520a3ec76e87b86733b0e409d2befa (commit)
       via  616462ce4588a629ffb2c814d1f63759ccafb2ad (commit)
      from  7bcca70df64dbc0f94e87c082a69e2da6f2684e9 (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=2ba2e108e8520a3ec76e87b86733b0e409d2befa
commit 2ba2e108e8520a3ec76e87b86733b0e409d2befa
Merge: 7bcca70 616462c
Author: David Cole <david.cole at kitware.com>
Date:   Mon Jun 21 12:09:03 2010 -0400

    Merge branch 'vs10-path-issue' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=616462ce4588a629ffb2c814d1f63759ccafb2ad
commit 616462ce4588a629ffb2c814d1f63759ccafb2ad
Author: David Cole <david.cole at kitware.com>
Date:   Mon Jun 21 11:47:16 2010 -0400

    Use full path file names to express dependencies.
    
    This is especially important for the Visual Studio 10
    generator and its quirky current working directory
    behavior.
    
    Also, emit more information about exactly what files are
    out of date when cmakeCheckStampFile returns false.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 136c177..e3f195a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -270,9 +270,11 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   cmCustomCommandLines commandLines;
   commandLines.push_back(commandLine);
   const char* no_working_directory = 0;
-  this->Makefile->AddCustomCommandToOutput(stampName.c_str(), listFiles,
-                                           makefileIn.c_str(), commandLines,
-                                           comment.c_str(),
+  std::string fullpathStampName = this->Convert(stampName.c_str(), FULL,
+                                            UNCHANGED);
+  this->Makefile->AddCustomCommandToOutput(fullpathStampName.c_str(),
+                                           listFiles, makefileIn.c_str(),
+                                           commandLines, comment.c_str(),
                                            no_working_directory, true);
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
     {
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f766d47..3ec9921 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3906,6 +3906,9 @@ static bool cmakeCheckStampFile(const char* stampName)
       // build system is really out of date.
       std::cout << "CMake is re-running because " << stampName
                 << " is out-of-date.\n";
+      std::cout << "  the file '" << dep << "'\n";
+      std::cout << "  is newer than '" << stampDepends << "'\n";
+      std::cout << "  result='" << result << "'\n";
       return false;
       }
     }

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    8 +++++---
 Source/cmake.cxx                         |    3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake