VS: Add manifest tool settings to VS 8 and 9 project files
Always generate a VCManifestTool element in targets that compile.
This commit is contained in:
parent
73a058f856
commit
6d620f5ad7
|
@ -972,9 +972,19 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
|
||||||
fout << "\t\t\t\tProxyFileName=\"$(InputName)_p.c\"/>\n";
|
fout << "\t\t\t\tProxyFileName=\"$(InputName)_p.c\"/>\n";
|
||||||
// end of <Tool Name=VCMIDLTool
|
// end of <Tool Name=VCMIDLTool
|
||||||
|
|
||||||
// Check if we need the FAT32 workaround.
|
// Add manifest tool settings.
|
||||||
if(targetBuilds && this->GetVersion() >= cmGlobalVisualStudioGenerator::VS8)
|
if(targetBuilds && this->GetVersion() >= cmGlobalVisualStudioGenerator::VS8)
|
||||||
{
|
{
|
||||||
|
const char* manifestTool = "VCManifestTool";
|
||||||
|
if (this->FortranProject)
|
||||||
|
{
|
||||||
|
manifestTool = "VFManifestTool";
|
||||||
|
}
|
||||||
|
fout <<
|
||||||
|
"\t\t\t<Tool\n"
|
||||||
|
"\t\t\t\tName=\"" << manifestTool << "\"";
|
||||||
|
|
||||||
|
// Check if we need the FAT32 workaround.
|
||||||
// Check the filesystem type where the target will be written.
|
// Check the filesystem type where the target will be written.
|
||||||
if (cmLVS6G_IsFAT(target.GetDirectory(configName).c_str()))
|
if (cmLVS6G_IsFAT(target.GetDirectory(configName).c_str()))
|
||||||
{
|
{
|
||||||
|
@ -982,15 +992,9 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
|
||||||
// for FAT32 file systems, which can cause an empty manifest
|
// for FAT32 file systems, which can cause an empty manifest
|
||||||
// to be embedded into the resulting executable. See CMake
|
// to be embedded into the resulting executable. See CMake
|
||||||
// bug #2617.
|
// bug #2617.
|
||||||
const char* manifestTool = "VCManifestTool";
|
fout << "\n\t\t\t\tUseFAT32Workaround=\"true\"";
|
||||||
if(this->FortranProject)
|
|
||||||
{
|
|
||||||
manifestTool = "VFManifestTool";
|
|
||||||
}
|
|
||||||
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << manifestTool << "\"\n"
|
|
||||||
<< "\t\t\t\tUseFAT32Workaround=\"true\"\n"
|
|
||||||
<< "\t\t\t/>\n";
|
|
||||||
}
|
}
|
||||||
|
fout << "/>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
this->OutputTargetRules(fout, configName, target, libName);
|
this->OutputTargetRules(fout, configName, target, libName);
|
||||||
|
|
Loading…
Reference in New Issue