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

VS6: Avoid _MBCS define when _SBCS is defined (#12189) 

Should fix the failing SBCS test on the VS6 dashboard.
This commit is contained in:
David Cole 2012-02-21 11:29:06 -05:00
parent ba89e92ba6
commit df19b9cadb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -1605,11 +1605,13 @@ void cmLocalVisualStudio6Generator
flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str()); flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" "; flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
} }
// if unicode is not found, then add -D_MBCS // if _UNICODE and _SBCS are not found, then add -D_MBCS
std::string defs = this->Makefile->GetDefineFlags(); std::string defs = this->Makefile->GetDefineFlags();
if(flags.find("D_UNICODE") == flags.npos && if(flags.find("D_UNICODE") == flags.npos &&
defs.find("D_UNICODE") == flags.npos) defs.find("D_UNICODE") == flags.npos &&
flags.find("D_SBCS") == flags.npos &&
defs.find("D_SBCS") == flags.npos)
{ {
flags += " /D \"_MBCS\""; flags += " /D \"_MBCS\"";
} }