[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-238-g9c8d082
Brad King
brad.king at kitware.com
Fri Oct 31 11:30:35 EDT 2014
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 9c8d08217cd578e1095254f16ccdaf1f44e25b33 (commit)
via 820e95d000911aae2ca0480ccb92e627f4ad0c48 (commit)
from 7deb590ad4cc23fee416327d3e785ba1fc506957 (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=9c8d08217cd578e1095254f16ccdaf1f44e25b33
commit 9c8d08217cd578e1095254f16ccdaf1f44e25b33
Merge: 7deb590 820e95d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 31 11:30:34 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 31 11:30:34 2014 -0400
Merge topic 'xcode-inherit-warning-flags' into next
820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=820e95d000911aae2ca0480ccb92e627f4ad0c48
commit 820e95d000911aae2ca0480ccb92e627f4ad0c48
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: Fri Oct 31 11:29:53 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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list