[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-596-g4c720d2

[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  4c720d2a9d2bc6de9c9894dc0e51b1e26fd8099d (commit)
       via  e5873cd32d16a09076faffa695768add1e64bf37 (commit)
       via  d8c40359730b73bd8b6423aee4a62b46f6399ebf (commit)
       via  efd5bd8d2d67222b6c46fb7078c90bfaec1fff62 (commit)
      from  e2c1c0170d6575bf931f7829a366a41124dedb48 (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=4c720d2a9d2bc6de9c9894dc0e51b1e26fd8099d
commit 4c720d2a9d2bc6de9c9894dc0e51b1e26fd8099d
Merge: e2c1c01 e5873cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 15:46:52 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 6 15:46:52 2014 -0500

    Merge topic 'dev/string-apis' into next
    
    e5873cd3 stringapi: Fix ctest_build command generator name comparison
    d8c40359 stringapi: Fix Xcode generator name comparison
    efd5bd8d stringapi: Fix Xcode generator virtual override of XML parser


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5873cd32d16a09076faffa695768add1e64bf37
commit e5873cd32d16a09076faffa695768add1e64bf37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 15:44:15 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 15:44:15 2014 -0500

    stringapi: Fix ctest_build command generator name comparison

diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index f8dd979..04eabd2 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -101,7 +101,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
         }
       if ( this->GlobalGenerator )
         {
-        if ( this->GlobalGenerator->GetName() == cmakeGeneratorName )
+        if ( this->GlobalGenerator->GetName() != cmakeGeneratorName )
           {
           delete this->GlobalGenerator;
           this->GlobalGenerator = 0;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8c40359730b73bd8b6423aee4a62b46f6399ebf
commit d8c40359730b73bd8b6423aee4a62b46f6399ebf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 15:43:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 15:43:55 2014 -0500

    stringapi: Fix Xcode generator name comparison

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2b2f20b..30a2a1e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -155,7 +155,7 @@ cmGlobalGeneratorFactory* cmGlobalXCodeGenerator::NewFactory()
 cmGlobalGenerator* cmGlobalXCodeGenerator::Factory
 ::CreateGlobalGenerator(const std::string& name) const
 {
-  if (name == GetActualName())
+  if (name != GetActualName())
     return 0;
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   cmXcodeVersionParser parser;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efd5bd8d2d67222b6c46fb7078c90bfaec1fff62
commit efd5bd8d2d67222b6c46fb7078c90bfaec1fff62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 15:29:28 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 15:29:28 2014 -0500

    stringapi: Fix Xcode generator virtual override of XML parser

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3cd2167..2b2f20b 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -34,17 +34,17 @@ class cmXcodeVersionParser : public cmXMLParser
 {
 public:
   cmXcodeVersionParser(): Version("1.5") {}
-  void StartElement(const char* , const char** )
+  void StartElement(const std::string&, const char**)
     {
       this->Data = "";
     }
-  void EndElement(const char* name)
+  void EndElement(const std::string& name)
     {
-      if(strcmp(name, "key") == 0)
+      if(name == "key")
         {
         this->Key = this->Data;
         }
-      else if(strcmp(name, "string") == 0)
+      else if(name == "string")
         {
         if(this->Key == "CFBundleShortVersionString")
           {

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

Summary of changes:
 Source/CTest/cmCTestBuildCommand.cxx |    2 +-
 Source/cmGlobalXCodeGenerator.cxx    |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake