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

Merge topic 'fix-10397-add-wchar_t-string-pool-flags'

Browse Source 
e9425d4 VS7/8/9: Add flag map for string pooling option (#10397)
ea9de57 VS8/9: Add flag map entries for /Zc:wchar_t (#10397)
This commit is contained in:
Brad King 2011-02-22 14:30:48 -05:00 committed by CMake Topic Stage
commit c033ba6769
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -358,8 +358,14 @@ static cmVS7FlagTable cmVS8ExtraFlagTable[] =
{"ExceptionHandling", "EHsc", "enable c++ exceptions", "1", 0}, {"ExceptionHandling", "EHsc", "enable c++ exceptions", "1", 0},
{"ExceptionHandling", "EHa", "enable SEH exceptions", "2", 0}, {"ExceptionHandling", "EHa", "enable SEH exceptions", "2", 0},
{"EnablePREfast", "analyze", "", "TRUE", 0}, {"EnablePREfast", "analyze", "", "true", 0},
{"EnablePREfast", "analyze-", "", "FALSE", 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} {0,0,0,0,0}
}; };

1
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -462,6 +462,7 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
"Disables whole program optimization", "FALSE", 0}, "Disables whole program optimization", "FALSE", 0},
{"WarnAsError", "WX", "Treat warnings as errors", "TRUE", 0}, {"WarnAsError", "WX", "Treat warnings as errors", "TRUE", 0},
{"BrowseInformation", "FR", "Generate browse information", "1", 0}, {"BrowseInformation", "FR", "Generate browse information", "1", 0},
{"StringPooling", "GF", "Enable StringPooling", "TRUE", 0},
{0,0,0,0,0} {0,0,0,0,0}
}; };