reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-25 04:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: fix for unicode and for /D -D

Browse Source
This commit is contained in:
Bill Hoffman 2003-10-17 16:08:49 -04:00
parent bd588e7a55
commit 545ae439b7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -328,7 +328,9 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// if -D_UNICODE or /D_UNICODE is found in the flags // if -D_UNICODE or /D_UNICODE is found in the flags
// change the character set to unicode, if not then // change the character set to unicode, if not then
// default to MBCS // default to MBCS
if(flags.find("D_UNICODE") != flags.npos ) std::string defs = m_Makefile->GetDefineFlags();
if(flags.find("D_UNICODE") != flags.npos ||
defs.find("D_UNICODE") != flags.npos)
{ {
fout << "\t\t\tCharacterSet=\"1\">\n"; fout << "\t\t\tCharacterSet=\"1\">\n";
} }
@ -692,6 +694,7 @@ void cmLocalVisualStudio7Generator::OutputLibraries(std::ostream& fout,
void cmLocalVisualStudio7Generator::OutputDefineFlags(std::ostream& fout) void cmLocalVisualStudio7Generator::OutputDefineFlags(std::ostream& fout)
{ {
std::string defs = m_Makefile->GetDefineFlags(); std::string defs = m_Makefile->GetDefineFlags();
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;
if(!done) if(!done)