From ea9de57750775dd80e83f6b6d5bd930a221b6f32 Mon Sep 17 00:00:00 2001 From: Sebastian Herbst Date: Tue, 9 Mar 2010 20:59:01 +0100 Subject: [PATCH 1/2] VS8/9: Add flag map entries for /Zc:wchar_t (#10397) --- Source/cmGlobalVisualStudio8Generator.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index b066179a7..ef723b7dc 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} }; From e9425d405373947662957a847a6827a4cd46670d Mon Sep 17 00:00:00 2001 From: Sebastian Herbst Date: Tue, 9 Mar 2010 21:00:56 +0100 Subject: [PATCH 2/2] VS7/8/9: Add flag map for string pooling option (#10397) --- Source/cmLocalVisualStudio7Generator.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 4f0cbb963..de5302512 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} };