diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-22 19:30:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-02-22 19:30:48 (GMT) |
| commit | c033ba676938859c372bf31f057bc9a478d10d02 (patch) | |
| tree | fc6aac5c9c3ac6e69f43de409583d40f2fb9e643 /Source | |
| parent | 52e2c22ee9ca0053f538c0982d0a854c28a4547c (diff) | |
| parent | e9425d405373947662957a847a6827a4cd46670d (diff) | |
| download | CMake-c033ba676938859c372bf31f057bc9a478d10d02.zip CMake-c033ba676938859c372bf31f057bc9a478d10d02.tar.gz CMake-c033ba676938859c372bf31f057bc9a478d10d02.tar.bz2 | |
Merge topic 'fix-10397-add-wchar_t-string-pool-flags'
e9425d4 VS7/8/9: Add flag map for string pooling option (#10397)
ea9de57 VS8/9: Add flag map entries for /Zc:wchar_t (#10397)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 10 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index b066179..ef723b7 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -358,8 +358,14 @@ static cmVS7FlagTable cmVS8ExtraFlagTable[] = {"ExceptionHandling", "EHsc", "enable c++ exceptions", "1", 0}, {"ExceptionHandling", "EHa", "enable SEH exceptions", "2", 0}, - {"EnablePREfast", "analyze", "", "TRUE", 0}, - {"EnablePREfast", "analyze-", "", "FALSE", 0}, + {"EnablePREfast", "analyze", "", "true", 0}, + {"EnablePREfast", "analyze-", "", "false", 0}, + + // Language options + {"TreatWChar_tAsBuiltInType", "Zc:wchar_t", + "wchar_t is a built-in type", "true", 0}, + {"TreatWChar_tAsBuiltInType", "Zc:wchar_t-", + "wchar_t is not a built-in type", "false", 0}, {0,0,0,0,0} }; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 4f0cbb9..de53025 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -462,6 +462,7 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] = "Disables whole program optimization", "FALSE", 0}, {"WarnAsError", "WX", "Treat warnings as errors", "TRUE", 0}, {"BrowseInformation", "FR", "Generate browse information", "1", 0}, + {"StringPooling", "GF", "Enable StringPooling", "TRUE", 0}, {0,0,0,0,0} }; |