[Cmake-commits] CMake branch, next, updated. v3.2.1-1665-g00d8fd8

[Brad King]

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  00d8fd810f35dee272776639c104ec38d7ab16ff (commit)
       via  6e3e4c66d5a5fe56818a261d68b23b48ef78cc49 (commit)
      from  78b6e5f85d2e10bdd6b2dab8dea4393c8b7b06f4 (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=00d8fd810f35dee272776639c104ec38d7ab16ff
commit 00d8fd810f35dee272776639c104ec38d7ab16ff
Merge: 78b6e5f 6e3e4c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 9 11:03:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 9 11:03:01 2015 -0400

    Merge topic 'introduce-cmState' into next
    
    6e3e4c66 fixup! cmState: Move CacheEntryType enum from cmCacheManager.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e3e4c66d5a5fe56818a261d68b23b48ef78cc49
commit 6e3e4c66d5a5fe56818a261d68b23b48ef78cc49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 9 11:02:31 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 9 11:02:31 2015 -0400

    fixup! cmState: Move CacheEntryType enum from cmCacheManager.

diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 5c9a18f..00386f6 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -255,7 +255,7 @@ void cmVisualStudioGeneratorOptions::StoreUnknownFlag(const char* flag)
 //----------------------------------------------------------------------------
 void cmVisualStudioGeneratorOptions::SetConfiguration(const char* config)
 {
-  this->State = config;
+  this->Configuration = config;
 }
 
 //----------------------------------------------------------------------------
@@ -274,12 +274,12 @@ cmVisualStudioGeneratorOptions
     {
     // if there are configuration specific flags, then
     // use the configuration specific tag for PreprocessorDefinitions
-    if(this->State.size())
+    if(this->Configuration.size())
       {
       fout << prefix;
       this->TargetGenerator->WritePlatformConfigTag(
         "PreprocessorDefinitions",
-        this->State.c_str(),
+        this->Configuration.c_str(),
         0,
         0, 0, &fout);
       }
@@ -346,11 +346,11 @@ cmVisualStudioGeneratorOptions
         m != this->FlagMap.end(); ++m)
       {
       fout << indent;
-      if(this->State.size())
+      if(this->Configuration.size())
         {
         this->TargetGenerator->WritePlatformConfigTag(
           m->first.c_str(),
-          this->State.c_str(),
+          this->Configuration.c_str(),
           0,
           0, 0, &fout);
         }
@@ -398,11 +398,11 @@ cmVisualStudioGeneratorOptions
     if(this->Version >= cmLocalVisualStudioGenerator::VS10)
       {
       fout << prefix;
-      if(this->State.size())
+      if(this->Configuration.size())
         {
         this->TargetGenerator->WritePlatformConfigTag(
           "AdditionalOptions",
-          this->State.c_str(),
+          this->Configuration.c_str(),
           0,
           0, 0, &fout);
         }

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

Summary of changes:
 Source/cmVisualStudioGeneratorOptions.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake