[Cmake-commits] CMake branch, next, updated. v3.1.1-2613-gd411243

Stephen Kelly steveire at gmail.com
Wed Feb 4 17:30:51 EST 2015


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  d41124347b64a473eb1a732fb9690a9712474444 (commit)
       via  0fd9256c91fed57453b298e19be624c70273b101 (commit)
      from  37e5f9557dc518b10eed9d8ff6b32ae76c78dd92 (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=d41124347b64a473eb1a732fb9690a9712474444
commit d41124347b64a473eb1a732fb9690a9712474444
Merge: 37e5f95 0fd9256
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 17:30:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 17:30:50 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    0fd9256c Features: Add dialect compile flags only if default is known.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fd9256c91fed57453b298e19be624c70273b101
commit 0fd9256c91fed57453b298e19be624c70273b101
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 23:26:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 23:27:45 2015 +0100

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

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 298d547..e3bac9e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2209,7 +2209,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     }
   const char* defaultStd
       = this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
-  if (defaultStd && !*defaultStd)
+  if (!defaultStd || !*defaultStd)
     {
     // This compiler has no notion of language standard levels.
     return;

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list