diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-21 16:29:06 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-02-21 16:29:06 (GMT) |
| commit | df19b9cadb5caca0f77ee87b8e28181e61c0658e (patch) | |
| tree | ec5a4e23bceab3d7880ae29a3d331eb1e71148fa | |
| parent | ba89e92ba622ed821a6adf31e8a6633d574ff656 (diff) | |
| download | CMake-df19b9cadb5caca0f77ee87b8e28181e61c0658e.zip CMake-df19b9cadb5caca0f77ee87b8e28181e61c0658e.tar.gz CMake-df19b9cadb5caca0f77ee87b8e28181e61c0658e.tar.bz2 | |
VS6: Avoid _MBCS define when _SBCS is defined (#12189)
Should fix the failing SBCS test on the VS6 dashboard.
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 1dfcbea..fe5d48d 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1605,11 +1605,13 @@ void cmLocalVisualStudio6Generator flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str()); 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(); 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\""; } |