[Cmake-commits] CMake branch, next, updated. v2.8.1-1482-g2563b77

[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  2563b770c24a3bd2284e839e65b1a98893d24962 (commit)
       via  d710a78a34b500b716ea2b61f24d9fd63e2ed090 (commit)
      from  62a0993c3ff758aa509fd115ecef4fbbb1700d0d (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=2563b770c24a3bd2284e839e65b1a98893d24962
commit 2563b770c24a3bd2284e839e65b1a98893d24962
Merge: 62a0993 d710a78
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 23 16:44:07 2010 -0400

    Merge branch 'vs10-path-issue' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d710a78a34b500b716ea2b61f24d9fd63e2ed090
commit d710a78a34b500b716ea2b61f24d9fd63e2ed090
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 23 16:39:28 2010 -0400

    For VS10: Really use full path file names.
    
    I naively assumed in my previous commit that the Convert call
    would correctly convert a relative path file name correctly
    relative to the makefile's current output directory. It actually
    converts it relative to the process's current working directory.
    So it would be different depending on how you launched cmake-gui.
    This commit ensures that the generated files are always the same
    by starting with a full path to begin with, based on the makefile
    GetCurrentOutputDirectory method.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index e3f195a..e411d3e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -234,7 +234,9 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash();
+  std::string stampName = this->Makefile->GetCurrentOutputDirectory();
+  stampName += "/";
+  stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
   const char* dsprule =
     this->Makefile->GetRequiredDefinition("CMAKE_COMMAND");

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

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


hooks/post-receive
-- 
CMake