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

ENH: fix bug 1324

This commit is contained in:
Bill Hoffman 2005-02-09 23:25:09 -05:00
parent c840bbcaaf
commit d8ed9ef121
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -284,11 +284,16 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
{ {
// create a map of xml tags to the values they should have in the output // create a map of xml tags to the values they should have in the output
// for example, "BufferSecurityCheck" = "TRUE" // for example, "BufferSecurityCheck" = "TRUE"
// first fill this table with the values for the configuration Debug, Release, etc, // first fill this table with the values for the configuration
// Then parse the command line flags specified in CMAKE_CXX_FLAGS and CMAKE_C_FLAGS // Debug, Release, etc,
// Then parse the command line flags specified in CMAKE_CXX_FLAGS
// and CMAKE_C_FLAGS
// and overwrite or add new values to this map // and overwrite or add new values to this map
std::map<cmStdString, cmStdString> flagMap; std::map<cmStdString, cmStdString> flagMap;
// since the default is on for this, but if /EHsc is found
// in the flags it will be turned on and we have /EHSC on by
// default in the CXX flags, then this is the only way to turn this off
flagMap["ExceptionHandling"] = "FALSE";
const char* mfcFlag = m_Makefile->GetDefinition("CMAKE_MFC_FLAG"); const char* mfcFlag = m_Makefile->GetDefinition("CMAKE_MFC_FLAG");
if(!mfcFlag) if(!mfcFlag)
{ {
@ -431,7 +436,16 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// now fill the flagMap from the command line flags, and // now fill the flagMap from the command line flags, and
// if a flag is used, it will be removed from the flags string by // if a flag is used, it will be removed from the flags string by
// this function call // this function call
this->FillFlagMapFromCommandFlags(flagMap, &cmLocalVisualStudio7GeneratorFlagTable[0], flags); this->FillFlagMapFromCommandFlags(flagMap,
&cmLocalVisualStudio7GeneratorFlagTable[0],
flags);
std::string defineFlags = m_Makefile->GetDefineFlags();
// now check the define flags for flags other than -D and
// put them in the map, the -D flags will be left in the defineFlags
// variable as -D is not in the flagMap
this->FillFlagMapFromCommandFlags(flagMap,
&cmLocalVisualStudio7GeneratorFlagTable[0],
defineFlags);
// output remaining flags that were not mapped to anything // output remaining flags that were not mapped to anything
fout << this->EscapeForXML(flags.c_str()).c_str(); fout << this->EscapeForXML(flags.c_str()).c_str();
fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;" fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;"
@ -478,7 +492,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
} }
fout << "," << exportSymbol; fout << "," << exportSymbol;
} }
this->OutputDefineFlags(fout); this->OutputDefineFlags(defineFlags.c_str(), fout);
fout << "\"\n"; fout << "\"\n";
fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n"; fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n";
fout << "\t\t\t\tObjectFile=\"" << configName << "\\\"\n"; fout << "\t\t\t\tObjectFile=\"" << configName << "\\\"\n";
@ -500,9 +514,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
std::string ipath = this->ConvertToXMLOutputPath(i->c_str()); std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
fout << ipath << ";"; fout << ipath << ";";
} }
// add the -D flags to the RC tool
fout << "\"\n" fout << "\"\n"
<< "\t\t\t\tPreprocessorDefinitions=\"" << pre; << "\t\t\t\tPreprocessorDefinitions=\"" << pre;
this->OutputDefineFlags(fout); this->OutputDefineFlags(defineFlags.c_str(), fout);
fout << "\" />\n"; fout << "\" />\n";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/>\n"; fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/>\n";
this->OutputTargetRules(fout, target, libName); this->OutputTargetRules(fout, target, libName);
@ -842,9 +857,10 @@ void cmLocalVisualStudio7Generator::OutputLibraries(std::ostream& fout,
} }
} }
void cmLocalVisualStudio7Generator::OutputDefineFlags(std::ostream& fout) void cmLocalVisualStudio7Generator::OutputDefineFlags(const char* flags,
std::ostream& fout)
{ {
std::string defs = m_Makefile->GetDefineFlags(); std::string defs = flags;
cmSystemTools::ReplaceString(defs, "/D","-D"); cmSystemTools::ReplaceString(defs, "/D","-D");
std::string::size_type pos = defs.find("-D"); std::string::size_type pos = defs.find("-D");
bool done = pos == std::string::npos; bool done = pos == std::string::npos;

3
Source/cmLocalVisualStudio7Generator.h
View File

@ -89,7 +89,8 @@ private:
std::string EscapeForXML(const char* s); std::string EscapeForXML(const char* s);
std::string ConvertToXMLOutputPath(const char* path); std::string ConvertToXMLOutputPath(const char* path);
std::string ConvertToXMLOutputPathSingle(const char* path); std::string ConvertToXMLOutputPathSingle(const char* path);
void OutputDefineFlags(std::ostream& fout); void OutputDefineFlags(const char* flags,
std::ostream& fout);
void OutputTargetRules(std::ostream& fout, void OutputTargetRules(std::ostream& fout,
const cmTarget &target, const cmTarget &target,
const char *libName); const char *libName);