diff options
| author | Ken Martin <ken.martin@kitware.com> | 2005-03-14 16:29:15 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2005-03-14 16:29:15 (GMT) |
| commit | 791aa6052b9033e89645b324b1c99222936981df (patch) | |
| tree | fdd95f48321d8074e4c97eaba0b03da3e885d409 /Source/cmLocalGenerator.cxx | |
| parent | f7c024df2a2ae6b8cf5ba127ee764a55f81f06e6 (diff) | |
| download | CMake-791aa6052b9033e89645b324b1c99222936981df.zip CMake-791aa6052b9033e89645b324b1c99222936981df.tar.gz CMake-791aa6052b9033e89645b324b1c99222936981df.tar.bz2 | |
ENH: add support for out of source source
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 0c7ea75..504b624 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -20,6 +20,7 @@ #include "cmMakefile.h" #include "cmGeneratedFileStream.h" #include "cmSourceFile.h" +#include "cmSubDirectory.h" #include "cmOrderLinkDirectories.h" cmLocalGenerator::cmLocalGenerator() @@ -318,12 +319,11 @@ void cmLocalGenerator::GenerateInstallRules() cmMakefile* mf = this->GetMakefile(); if ( !mf->GetSubDirectories().empty() ) { - const std::vector<std::pair<cmStdString, bool> >& subdirs = mf->GetSubDirectories(); - std::vector<std::pair<cmStdString, bool> >::const_iterator i = subdirs.begin(); + const std::vector<cmSubDirectory>& subdirs = mf->GetSubDirectories(); + std::vector<cmSubDirectory>::const_iterator i = subdirs.begin(); for(; i != subdirs.end(); ++i) { - std::string odir = mf->GetCurrentOutputDirectory(); - odir += "/" + (*i).first; + std::string odir = i->BinaryPath; cmSystemTools::ConvertToUnixSlashes(odir); fout << "INCLUDE(\"" << odir.c_str() << "/cmake_install.cmake\")" << std::endl; |