diff options
author | Brad King <brad.king@kitware.com> | 2014-08-11 14:00:05 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-08-11 14:00:05 (GMT) |
commit | 4988b174923dd20620d1c7ee9feec6d04386cbc4 (patch) | |
tree | a5e99924554fd83870251bd5038338a584b7bf6f /Source | |
parent | c6f1c5585aabdd2f670e3fc5390ffef43232456f (diff) | |
parent | 59c3695edd8795b9c3b8eb7cacd3991b6a9860f6 (diff) | |
download | CMake-4988b174923dd20620d1c7ee9feec6d04386cbc4.zip CMake-4988b174923dd20620d1c7ee9feec6d04386cbc4.tar.gz CMake-4988b174923dd20620d1c7ee9feec6d04386cbc4.tar.bz2 |
Merge branch 'backport-fix-CMP0047-IS_GNU-vars' into release
Diffstat (limited to 'Source')
-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 beb10da..203735a 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -804,6 +804,14 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf, case cmPolicies::OLD: // OLD behavior is to convert QCC to GNU. mf->AddDefinition(compilerIdVar.c_str(), "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: |