summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2010-06-23 16:39:28 -0400
committerDavid Cole <david.cole@kitware.com>2010-06-23 16:39:28 -0400
commitd710a78a34b500b716ea2b61f24d9fd63e2ed090 (patch)
treef1cf4920515d1664bef4018be74b707b208d2767
parent616462ce4588a629ffb2c814d1f63759ccafb2ad (diff)
downloadcmake-d710a78a34b500b716ea2b61f24d9fd63e2ed090.tar.gz
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.
-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");