[Cmake-commits] CMake branch, next, updated. v3.0.0-3719-ga60b64a

[Stephen Kelly]

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  a60b64ae3e8d51143b5ec62eb25c30090581535e (commit)
       via  8204897f10809ca9ee09d3661c8b732612eb132b (commit)
      from  99d501f00732610fa6187463613abb6835bfe3e7 (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=a60b64ae3e8d51143b5ec62eb25c30090581535e
commit a60b64ae3e8d51143b5ec62eb25c30090581535e
Merge: 99d501f 8204897
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 13 12:49:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 13 12:49:46 2014 -0400

    Merge topic 'features-cleanups' into next
    
    8204897f Fix access violation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8204897f10809ca9ee09d3661c8b732612eb132b
commit 8204897f10809ca9ee09d3661c8b732612eb132b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 13 18:49:22 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jun 13 18:49:22 2014 +0200

    Fix access violation.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 30ba220..8ae1157 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2229,7 +2229,10 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
            "does not know the compile flags to use to enable it.";
       this->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
       }
-    this->AppendFlagEscape(flags, opt);
+    else
+      {
+      this->AppendFlagEscape(flags, opt);
+      }
     return;
     }
 

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake