summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-06-14 14:28:04 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-06-14 14:28:04 (GMT)
commitc15adc922166ca84c03a4ae4f076256a93046ece (patch)
treeff1705ef8e7df2ee9cf3254a9efac569a07e1e0d
parenta014eee86ae91e590a2a554ea89f07de0fac5b81 (diff)
downloadCMake-c15adc922166ca84c03a4ae4f076256a93046ece.zip
CMake-c15adc922166ca84c03a4ae4f076256a93046ece.tar.gz
CMake-c15adc922166ca84c03a4ae4f076256a93046ece.tar.bz2
BUG: fix sub project path problem
-rw-r--r--Source/cmGlobalVisualStudio6Generator.cxx3
-rw-r--r--Source/cmGlobalVisualStudio71Generator.cxx3
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx3
3 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index e585213..e6f4bad 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -216,7 +216,8 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout,
this->WriteDSWHeader(fout);
// Get the home directory with the trailing slash
- std::string homedir = m_CMakeInstance->GetHomeDirectory();
+#undef GetCurrentDirectory
+ std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/";
unsigned int i;
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 5d3c19d..3db033d 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -48,7 +48,8 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
this->WriteSLNHeader(fout);
// Get the home directory with the trailing slash
- std::string homedir = m_CMakeInstance->GetHomeDirectory();
+ #undef GetCurrentDirectory
+ std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/";
bool doneAllBuild = false;
bool doneRunTests = false;
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 7935f2c..0e2cc33 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -316,7 +316,8 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
this->WriteSLNHeader(fout);
// Get the home directory with the trailing slash
- std::string homedir = m_CMakeInstance->GetHomeDirectory();
+#undef GetCurrentDirectory
+ std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/";
bool doneAllBuild = false;
bool doneRunTests = false;