Просмотр исходного кода

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)
Brad King 15 лет назад
Родитель
Сommit
c033ba6769

+ 8 - 2
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}
 };

+ 1 - 0
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}
 };