diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-28 13:25:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-28 13:26:02 (GMT) |
| commit | c8d2e81e095627d4155347252dda064b3dd972f6 (patch) | |
| tree | 33795267024617b448b30df720d75ca438bb1e35 /Source | |
| parent | c6223262a38e5dd0629897e01b2d85d97e3acc3e (diff) | |
| parent | a3cafa4237930d1ec1bcbdddc8a9c592e32458ca (diff) | |
| download | CMake-c8d2e81e095627d4155347252dda064b3dd972f6.zip CMake-c8d2e81e095627d4155347252dda064b3dd972f6.tar.gz CMake-c8d2e81e095627d4155347252dda064b3dd972f6.tar.bz2 | |
Merge topic 'target_compile_features-only-apply-to-enabled-languages'
a3cafa4237 compile_features: Ignore features that map to languages that aren't enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6255
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmStandardLevelResolver.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmStandardLevelResolver.cxx b/Source/cmStandardLevelResolver.cxx index 37ed4c1..74b9d6f 100644 --- a/Source/cmStandardLevelResolver.cxx +++ b/Source/cmStandardLevelResolver.cxx @@ -387,6 +387,10 @@ bool cmStandardLevelResolver::CheckCompileFeaturesAvailable( return false; } + if (!this->Makefile->GetGlobalGenerator()->GetLanguageEnabled(lang)) { + return true; + } + const char* features = this->CompileFeaturesAvailable(lang, error); if (!features) { return false; |