[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-214-g2d1d312

[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  2d1d312f9812366f5a84edfc3aecd3566f62b60a (commit)
       via  3563e4d356a96666981576c3894838deabcd4470 (commit)
       via  5c5c1e3c7dee614ab108a8809507a907a629a9d3 (commit)
      from  d62a6161aeca493054c4c42bab90897d41f505b1 (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=2d1d312f9812366f5a84edfc3aecd3566f62b60a
commit 2d1d312f9812366f5a84edfc3aecd3566f62b60a
Merge: d62a616 3563e4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 30 13:35:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 30 13:35:20 2014 -0400

    Merge topic 'xcode-inherit-warning-flags' into next
    
    3563e4d3 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
    5c5c1e3c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3563e4d356a96666981576c3894838deabcd4470
commit 3563e4d356a96666981576c3894838deabcd4470
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 30 12:38:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 30 12:38:15 2014 -0400

    Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
    
    Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their
    own warning flags and have them used by the targets.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 13e6988..5e7a898 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2314,6 +2314,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     group->AddObject(this->CreateString("-Wmost"));
     group->AddObject(this->CreateString("-Wno-four-char-constants"));
     group->AddObject(this->CreateString("-Wno-unknown-pragmas"));
+    group->AddObject(this->CreateString("$(inherited)"));
     buildSettings->AddAttribute("WARNING_CFLAGS", group);
     }
   else

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalXCodeGenerator.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake