diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-08 20:14:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-08 20:14:03 (GMT) |
| commit | f55119e63b4063daf6c8cdce5eb5415d04b0c2bd (patch) | |
| tree | 5afda3c63fb305d3c646c7046f1ea2694afd9411 /Source/cmLocalVisualStudio6Generator.cxx | |
| parent | 9f6c38253a29288a7f8479d43e7c87fd3d958e79 (diff) | |
| parent | b28e7fa174798717ebf8e18b8d97755d3568b04d (diff) | |
| download | CMake-f55119e63b4063daf6c8cdce5eb5415d04b0c2bd.zip CMake-f55119e63b4063daf6c8cdce5eb5415d04b0c2bd.tar.gz CMake-f55119e63b4063daf6c8cdce5eb5415d04b0c2bd.tar.bz2 | |
Merge topic 'fix-12189-support-SBCS-in-VS'
b28e7fa VS6: Avoid SBCS test on VS6 (#12189)
df19b9c VS6: Avoid _MBCS define when _SBCS is defined (#12189)
ba89e92 Visual Studio: Allow setting Single Byte Character Set (#12189)
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
| -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 c846d6b..6b31e54 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1620,11 +1620,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\""; } |