[Cmake-commits] CMake branch, next, updated. v2.8.3-1551-g94e1bc8

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  94e1bc8aa7f195b57201959df3dbb67c13a3229b (commit)
       via  e9425d405373947662957a847a6827a4cd46670d (commit)
       via  ea9de57750775dd80e83f6b6d5bd930a221b6f32 (commit)
      from  19aa60d1da62dd95021d975aa406403f3c5b3d9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94e1bc8aa7f195b57201959df3dbb67c13a3229b
commit 94e1bc8aa7f195b57201959df3dbb67c13a3229b
Merge: 19aa60d e9425d4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 1 15:20:25 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 1 15:20:25 2011 -0500

    Merge topic 'fix-10397-add-wchar_t-string-pool-flags' into next
    
    e9425d4 VS7/8/9: Add flag map for string pooling option (#10397)
    ea9de57 VS8/9: Add flag map entries for /Zc:wchar_t (#10397)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9425d405373947662957a847a6827a4cd46670d
commit e9425d405373947662957a847a6827a4cd46670d
Author:     Sebastian Herbst <template.meta.programmer at googlemail.com>
AuthorDate: Tue Mar 9 21:00:56 2010 +0100
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Feb 1 15:09:05 2011 -0500

    VS7/8/9: Add flag map for string pooling option (#10397)

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}
 };
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea9de57750775dd80e83f6b6d5bd930a221b6f32
commit ea9de57750775dd80e83f6b6d5bd930a221b6f32
Author:     Sebastian Herbst <template.meta.programmer at googlemail.com>
AuthorDate: Tue Mar 9 20:59:01 2010 +0100
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Feb 1 15:03:10 2011 -0500

    VS8/9: Add flag map entries for /Zc:wchar_t (#10397)

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}
 };

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   10 ++++++++--
 Source/cmLocalVisualStudio7Generator.cxx  |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake