[Cmake-commits] CMake branch, next, updated. v3.1.1-2580-gf54e479

[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  f54e479a42f74753a9052fe0eb822d407d5f2a76 (commit)
       via  12f30fde379d3bfe6c6302c5d50915a413f2c5af (commit)
      from  294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb (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=f54e479a42f74753a9052fe0eb822d407d5f2a76
commit f54e479a42f74753a9052fe0eb822d407d5f2a76
Merge: 294d9ad 12f30fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 13:37:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 13:37:32 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    12f30fde Features: Allow setting standard dialect below the default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12f30fde379d3bfe6c6302c5d50915a413f2c5af
commit 12f30fde379d3bfe6c6302c5d50915a413f2c5af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 19:14:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 19:34:17 2015 +0100

    Features: Allow setting standard dialect below the default.
    
    Prior to looping from the requested version to the default dialect
    to find a suitable flag, find a suitable flag it the default dialect
    or a previous dialect is selected. In that case, the loop is not
    entered at all.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..298d547 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2287,7 +2287,21 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     defaultStdIt = stds.end() - 1;
     }
 
-  for ( ; stdIt <= defaultStdIt; ++stdIt)
+  // Greater or equal because the standards are stored in
+  // backward chronological order.
+  if (stdIt >= defaultStdIt)
+    {
+    std::string option_flag =
+              "CMAKE_" + lang + *stdIt
+                      + "_" + type + "_COMPILE_OPTION";
+
+    const char *opt =
+        target->GetMakefile()->GetRequiredDefinition(option_flag);
+    this->AppendFlagEscape(flags, opt);
+    return;
+    }
+
+  for ( ; stdIt < defaultStdIt; ++stdIt)
     {
     std::string option_flag =
               "CMAKE_" + lang + *stdIt

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

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


hooks/post-receive
-- 
CMake