[Cmake-commits] CMake branch, next, updated. v2.8.2-131-g9baf838

[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  9baf8388621af3b9296d74ade9397598013cc907 (commit)
       via  13ca4ef6656c2d06231e1966ff54a3943459e7e2 (commit)
      from  f42285bcb9cb34146f239bc4d5928f538b421bac (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=9baf8388621af3b9296d74ade9397598013cc907
commit 9baf8388621af3b9296d74ade9397598013cc907
Merge: f42285b 13ca4ef
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 08:25:42 2010 -0400

    Merge branch 'vs-ps3-projects' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13ca4ef6656c2d06231e1966ff54a3943459e7e2
commit 13ca4ef6656c2d06231e1966ff54a3943459e7e2
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 28 15:51:13 2010 -0400

    VS: Always separate preprocessor defs by semicolon (#10902)
    
    Separation by ',' only works in VS 2008 and below and does not work in
    the PlayStation3 VS plugin.  Separation by ';' works in VS 10 and all
    prior versions.

diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 051cc1f..972af95 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -183,7 +183,7 @@ cmVisualStudioGeneratorOptions
     {
     fout << prefix <<  "PreprocessorDefinitions=\"";
     }
-  const char* comma = "";
+  const char* sep = "";
   for(std::vector<std::string>::const_iterator di = this->Defines.begin();
       di != this->Defines.end(); ++di)
     {
@@ -208,15 +208,8 @@ cmVisualStudioGeneratorOptions
       define = cmVisualStudioGeneratorOptionsEscapeForXML(define.c_str());
       }
     // Store the flag in the project file.
-    fout << comma << define;
-    if(this->Version == 10)
-      {
-      comma = ";";
-      }
-    else
-      {
-      comma = ",";
-      }
+    fout << sep << define;
+    sep = ";";
     }
   if(this->Version == 10)
     {

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

Summary of changes:
 Source/cmVisualStudioGeneratorOptions.cxx |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake