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

BUG: make sure -M flags are not duplicated and are only set in the xml

Browse Source
This commit is contained in:
Bill Hoffman 2003-10-17 16:19:37 -04:00
parent 9a4c654d23
commit 16fe086267
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -344,6 +344,44 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
<< "\t\t\t\tAdditionalOptions=\""; << "\t\t\t\tAdditionalOptions=\"";
cmSystemTools::ReplaceString(flags, "\"", "&quot;"); cmSystemTools::ReplaceString(flags, "\"", "&quot;");
// check the flags for the run time library flag options
// if there is a match set the run time flag
if(flags.find("MTd") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-MTd", "");
cmSystemTools::ReplaceString(flags, "/MTd", "");
runtime = 1;
}
else if (flags.find("MDd") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-MDd", "");
cmSystemTools::ReplaceString(flags, "/MDd", "");
runtime = 3;
}
else if (flags.find("MLd") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-MLd", "");
cmSystemTools::ReplaceString(flags, "/MLd", "");
runtime = 5;
}
else if (flags.find("MT") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-MT", "");
cmSystemTools::ReplaceString(flags, "/MT", "");
runtime = 0;
}
else if (flags.find("MD") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-MD", "");
cmSystemTools::ReplaceString(flags, "/MD", "");
runtime = 2;
}
else if (flags.find("ML") != flags.npos)
{
cmSystemTools::ReplaceString(flags, "-ML", "");
cmSystemTools::ReplaceString(flags, "/ML", "");
runtime = 4;
}
fout << flags; fout << flags;
fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;" fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;"
@ -358,32 +396,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
fout << ipath << ";"; fout << ipath << ";";
} }
fout << "\"\n"; fout << "\"\n";
// check the flags for the run time library flag options
// if there is a match set the run time flag
if(flags.find("MTd") != flags.npos)
{
runtime = 1;
}
else if (flags.find("MDd") != flags.npos)
{
runtime = 3;
}
else if (flags.find("MLd") != flags.npos)
{
runtime = 5;
}
else if (flags.find("MT") != flags.npos)
{
runtime = 0;
}
else if (flags.find("MD") != flags.npos)
{
runtime = 2;
}
else if (flags.find("ML") != flags.npos)
{
runtime = 4;
}
fout << "\t\t\t\tOptimization=\"" << optimized << "\"\n" fout << "\t\t\t\tOptimization=\"" << optimized << "\"\n"
<< "\t\t\t\tRuntimeLibrary=\"" << runtime << "\"\n" << "\t\t\t\tRuntimeLibrary=\"" << runtime << "\"\n"