diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-11 13:54:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-11 13:54:12 (GMT) |
| commit | 348999a125f3cf6936a2d5ab4f276b813443f1be (patch) | |
| tree | 292985f4723f43f247407fc0d3ea0dac0556074d | |
| parent | 2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d (diff) | |
| parent | 70796ef026e8d10a4e50c8e26472d469a45f7dd5 (diff) | |
| download | CMake-348999a125f3cf6936a2d5ab4f276b813443f1be.zip CMake-348999a125f3cf6936a2d5ab4f276b813443f1be.tar.gz CMake-348999a125f3cf6936a2d5ab4f276b813443f1be.tar.bz2 | |
Merge topic 'fix-CMP0047-IS_GNU-vars'
70796ef0 CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
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: |