summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-24 10:40:26 -0400
committerBrad King <brad.king@kitware.com>2010-06-24 10:40:26 -0400
commitb86a551edee8d061989c4b2c25bdd09e5f9d3dec (patch)
tree0734f443727a1758663200477b00556d2c11aa13
parent5890f562e3ded6f7e42e0a974aa0c9193d011cca (diff)
parentd710a78a34b500b716ea2b61f24d9fd63e2ed090 (diff)
downloadcmake-b86a551edee8d061989c4b2c25bdd09e5f9d3dec.tar.gz
Merge branch 'vs10-path-issue'
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index e3f195a056..e411d3e544 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");