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

BUG: Need to clean manifest files that may have been generated for .exe and .dll files.

Browse Source
This commit is contained in:
Brad King 2006-08-15 15:28:29 -04:00
parent c6f1a11480
commit c7daee6860
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -272,6 +272,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
exeCleanFiles.push_back(this->Convert(cleanFullName.c_str(), exeCleanFiles.push_back(this->Convert(cleanFullName.c_str(),
cmLocalGenerator::START_OUTPUT, cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED)); cmLocalGenerator::UNCHANGED));
#ifdef _WIN32
// There may be a manifest file for this target. Add it to the
// clean set just in case.
exeCleanFiles.push_back(this->Convert((cleanFullName+".manifest").c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED));
#endif
if(cleanRealName != cleanName) if(cleanRealName != cleanName)
{ {
exeCleanFiles.push_back(this->Convert(cleanFullRealName.c_str(), exeCleanFiles.push_back(this->Convert(cleanFullRealName.c_str(),

13
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -393,6 +393,19 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmLocalGenerator::UNCHANGED)); cmLocalGenerator::UNCHANGED));
} }
} }
#ifdef _WIN32
// There may be a manifest file for this target. Add it to the
// clean set just in case.
if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
{
libCleanFiles.push_back(
this->Convert((targetFullPath+".manifest").c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED));
}
#endif
// Add a command to remove any existing files for this library. // Add a command to remove any existing files for this library.
std::vector<std::string> commands1; std::vector<std::string> commands1;
this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles, this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,