kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Install scripts should honor EXCLUDE_FROM_ALL options for subdirectories. This addresses bug#3100.

Browse Source
This commit is contained in:
Brad King 2006-04-11 13:32:48 -04:00
parent 535acdc7a0
commit ae2cbc346d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmLocalGenerator.cxx
View File

@ -355,17 +355,21 @@ void cmLocalGenerator::GenerateInstallRules()
this->GenerateTargetInstallRules(fout, config, configurationTypes); this->GenerateTargetInstallRules(fout, config, configurationTypes);
// Include install scripts from subdirectories. // Include install scripts from subdirectories.
if ( this->Children.size()) if(!this->Children.empty())
{ {
std::vector<cmLocalGenerator*>::const_iterator i = this->Children.begin(); fout << "# Include the install script for each subdirectory.\n";
for(; i != this->Children.end(); ++i) for(std::vector<cmLocalGenerator*>::const_iterator
ci = this->Children.begin(); ci != this->Children.end(); ++ci)
{ {
std::string odir = (*i)->GetMakefile()->GetStartOutputDirectory(); if(!(*ci)->GetExcludeAll())
cmSystemTools::ConvertToUnixSlashes(odir); {
fout << "INCLUDE(\"" << odir.c_str() std::string odir = (*ci)->GetMakefile()->GetStartOutputDirectory();
<< "/cmake_install.cmake\")" << std::endl; cmSystemTools::ConvertToUnixSlashes(odir);
fout << "INCLUDE(\"" << odir.c_str()
<< "/cmake_install.cmake\")" << std::endl;
}
} }
fout << std::endl;; fout << "\n";
} }
// Record the install manifest. // Record the install manifest.