[Cmake-commits] CMake branch, next, updated. v3.1.1-2615-g467b715

[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  467b7158cb60adca53fbeac2dfe2f5699cba7fb1 (commit)
       via  9e8ab436e1482b8aadc00951da55fca0e5e485af (commit)
      from  d41124347b64a473eb1a732fb9690a9712474444 (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=467b7158cb60adca53fbeac2dfe2f5699cba7fb1
commit 467b7158cb60adca53fbeac2dfe2f5699cba7fb1
Merge: d411243 9e8ab43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:27:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 18:27:22 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    9e8ab436 fixup! Features: Add dialect compile flags only if default is known.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8ab436e1482b8aadc00951da55fca0e5e485af
commit 9e8ab436e1482b8aadc00951da55fca0e5e485af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:16:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:22:58 2015 -0500

    fixup! Features: Add dialect compile flags only if default is known.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e3bac9e..400415b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2276,15 +2276,15 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
                                 std::find(stds.begin(), stds.end(), standard);
   assert(stdIt != stds.end());
 
-  std::vector<std::string>::const_iterator defaultStdIt;
-  if (defaultStd)
-    {
-    defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
-    assert(defaultStdIt != stds.end());
-    }
-  else
-    {
-    defaultStdIt = stds.end() - 1;
+  std::vector<std::string>::const_iterator defaultStdIt =
+    std::find(stds.begin(), stds.end(), defaultStd);
+  if (defaultStdIt == stds.end())
+    {
+    std::string e =
+      "CMAKE_" + lang + "_STANDARD_DEFAULT is set to invalid value '" +
+      std::string(defaultStd) + "'";
+    this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, e);
+    return;
     }
 
   // Greater or equal because the standards are stored in

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake