summaryrefslogtreecommitdiffstats
path: root/Source/cmDepends.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-05-25 16:22:32 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-05-25 16:22:32 (GMT)
commitd7cbf3e1d6c3753b4d05cf43e0d9978ad154f5ff (patch)
treededfc603511a8c9d5dda7c11850ed8a895db244c /Source/cmDepends.cxx
parent0e194cab8493026b036f492f26234878be9a12ed (diff)
downloadCMake-d7cbf3e1d6c3753b4d05cf43e0d9978ad154f5ff.zip
CMake-d7cbf3e1d6c3753b4d05cf43e0d9978ad154f5ff.tar.gz
CMake-d7cbf3e1d6c3753b4d05cf43e0d9978ad154f5ff.tar.bz2
BUG: a fix for constant recomputing of depends
Diffstat (limited to 'Source/cmDepends.cxx')
-rw-r--r--Source/cmDepends.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 9544662..165eee0 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -48,6 +48,11 @@ void cmDepends::SetTargetFile(const char* dir, const char* targetFile,
m_DependsMarkFile += m_TargetFile;
m_DependsMakeFile += makeExt;
m_DependsMarkFile += markExt;
+
+ if (!m_CompileDirectory.size())
+ {
+ m_CompileDirectory = dir;
+ }
}
@@ -79,12 +84,12 @@ void cmDepends::Check()
{
// Dependency checks must be done in proper working directory.
std::string oldcwd = ".";
- if(m_Directory != ".")
+ if(m_CompileDirectory != ".")
{
// Get the CWD but do not call CollapseFullPath because
// we only need it to cd back, and the form does not matter
oldcwd = cmSystemTools::GetCurrentWorkingDirectory(false);
- cmSystemTools::ChangeDirectory(m_Directory.c_str());
+ cmSystemTools::ChangeDirectory(m_CompileDirectory.c_str());
}
// Check whether dependencies must be regenerated.