[Cmake-commits] CMake branch, master, updated. cf3e42f811e63d430557d0f4d659ea3a9bc69d4e

[cmake-commits at cmake.org]

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, master has been updated
       via  cf3e42f811e63d430557d0f4d659ea3a9bc69d4e (commit)
      from  a63dc3271aa89b954101ec5472ef3fc3ec856507 (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=cf3e42f811e63d430557d0f4d659ea3a9bc69d4e
commit cf3e42f811e63d430557d0f4d659ea3a9bc69d4e
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Fri Apr 2 14:09:06 2010 -0400

    Partial fix from bug #10503, use full paths to fix custom commands.
    
    This fixes tests ExternalProject and LinkDirectory for VS 2010.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 1af0d1d..8249d9e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -236,7 +236,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
   std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
-  const char* dsprule = 
+  const char* dsprule =
     this->Makefile->GetRequiredDefinition("CMAKE_COMMAND");
   cmCustomCommandLine commandLine;
   commandLine.push_back(dsprule);
@@ -261,7 +261,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
                   START_OUTPUT, UNCHANGED, true);
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
-  commandLine.push_back(stampName.c_str());
+  std::string stampFilename = this->Convert(stampName.c_str(), FULL,
+                                            SHELL);
+  commandLine.push_back(stampFilename.c_str());
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
 
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index f3ed5b6..ed0b07f 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -169,7 +169,7 @@ cmLocalVisualStudioGenerator
     script += newline;
     newline = newline_text;
     script += "cd ";
-    script += this->Convert(workingDirectory, START_OUTPUT, SHELL);
+    script += this->Convert(workingDirectory, FULL, SHELL);
 
     // Change the working drive.
     if(workingDirectory[0] && workingDirectory[1] == ':')

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

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


hooks/post-receive
-- 
CMake