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 0e3015f3add67ecd9596b3805f42a9388fbf2db0 (commit)
via 70796ef026e8d10a4e50c8e26472d469a45f7dd5 (commit)
from 979ee2084090ef56386f4edf80344bf80fcb6923 (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=0e3015f3add67ecd9596b3805f42a9388fbf2db0
commit 0e3015f3add67ecd9596b3805f42a9388fbf2db0
Merge: 979ee20 70796ef
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 7 11:26:55 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Aug 7 11:26:55 2014 -0400
Merge topic 'fix-CMP0047-IS_GNU-vars' into next
70796ef0 CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70796ef026e8d10a4e50c8e26472d469a45f7dd5
commit 70796ef026e8d10a4e50c8e26472d469a45f7dd5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 7 11:16:24 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Aug 7 11:24:57 2014 -0400
CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior
The implementation of CMP0047 detects the QNX compiler id internally,
then changes it to GNU after the language is fully enabled. This is too
late to correctly set the old IS_GNU variables, so set them as part of
the policy OLD behavior.
Reported-by: Mike Lattanzio <mlattan...@blackberry.com>
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 38ba5d1..3f948b5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -844,6 +844,14 @@ void
cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
case cmPolicies::OLD:
// OLD behavior is to convert QCC to GNU.
mf->AddDefinition(compilerIdVar, "GNU");
+ if(lang == "C")
+ {
+ mf->AddDefinition("CMAKE_COMPILER_IS_GNUCC", "1");
+ }
+ else if(lang == "CXX")
+ {
+ mf->AddDefinition("CMAKE_COMPILER_IS_GNUCXX", "1");
+ }
break;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
