summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-02-18 16:51:23 (GMT)
committerBrad King <brad.king@kitware.com>2006-02-18 16:51:23 (GMT)
commit9ba02838701e2513414f258dec9d63566ee9b481 (patch)
tree5b268384b83211c28c03c46f68a2598396c3f4ba /Source/cmLocalVisualStudio7Generator.cxx
parentfc70e3512ad2785daad4629f62309d12f1a3a32b (diff)
downloadCMake-9ba02838701e2513414f258dec9d63566ee9b481.zip
CMake-9ba02838701e2513414f258dec9d63566ee9b481.tar.gz
CMake-9ba02838701e2513414f258dec9d63566ee9b481.tar.bz2
ENH: If CMAKE_NO_AUTOMATIC_INCLUDE_DIRECTORIES is not set try to approximate in-source build include file behavior in an out-of-source build by adding the build tree directory corresponding to a source tree directory at the beginning of the include path. Also fixed VS6 and VS7 generators to use cmLocalGenerator's computation of include paths. The VS6 generator will now short-path the include directories if the total length is too long in order to try to avoid its truncation limit.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index d05c19e..aabe886 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -566,7 +566,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;"
<< "\"\n";
fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
- std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories();
+ std::vector<std::string> includes;
+ this->GetIncludeDirectories(includes);
std::vector<std::string>::iterator i = includes.begin();
for(;i != includes.end(); ++i)
{