diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-03-09 21:28:44 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-03-09 21:28:44 (GMT) |
| commit | ddb815c12542f80f42562877298a73fab39bb4ca (patch) | |
| tree | 825a90988e4710274a656b8f9bf7f32b7d0827fa /Source/cmLocalGenerator.cxx | |
| parent | bf699505bc7fc378abf07ec4dfa0f0cc4fb89686 (diff) | |
| download | CMake-ddb815c12542f80f42562877298a73fab39bb4ca.zip CMake-ddb815c12542f80f42562877298a73fab39bb4ca.tar.gz CMake-ddb815c12542f80f42562877298a73fab39bb4ca.tar.bz2 | |
ENH: add new subdirectory exclude from top option
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index a108b13..eea1b17 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -24,6 +24,8 @@ cmLocalGenerator::cmLocalGenerator() { m_Makefile = new cmMakefile; m_Makefile->SetLocalGenerator(this); + m_ExcludeFromAll = false; + m_Parent = 0; } cmLocalGenerator::~cmLocalGenerator() @@ -229,12 +231,12 @@ void cmLocalGenerator::GenerateInstallRules() cmMakefile* mf = this->GetMakefile(); if ( !mf->GetSubDirectories().empty() ) { - const std::vector<std::string>& subdirs = mf->GetSubDirectories(); - std::vector<std::string>::const_iterator i = subdirs.begin(); + const std::vector<std::pair<cmStdString, bool> >& subdirs = mf->GetSubDirectories(); + std::vector<std::pair<cmStdString, bool> >::const_iterator i = subdirs.begin(); for(; i != subdirs.end(); ++i) { std::string odir = mf->GetCurrentOutputDirectory(); - odir += "/" + (*i); + odir += "/" + (*i).first; cmSystemTools::ConvertToUnixSlashes(odir); fout << "INCLUDE(" << odir.c_str() << "/cmake_install.cmake)" << std::endl; |