summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorNeal Venditto <nvenditto@gmail.com>2023-02-17 23:17:06 (GMT)
committerBrad King <brad.king@kitware.com>2023-02-18 00:07:37 (GMT)
commit780b279cc6394cf5de3a86c94c33e8e9bfd7f5cf (patch)
tree8f0d671c4ec1319d7d891111394138e391025683 /Source
parent4f45993a5cffee30056847720b010a624683f04b (diff)
downloadCMake-780b279cc6394cf5de3a86c94c33e8e9bfd7f5cf.zip
CMake-780b279cc6394cf5de3a86c94c33e8e9bfd7f5cf.tar.gz
CMake-780b279cc6394cf5de3a86c94c33e8e9bfd7f5cf.tar.bz2
GHS: Enable language-dependent generator expressions
Add `Green Hills MULTI` to the list of generators checked for the `COMPILE_LANGUAGE`, `COMPILE_LANG_AND_ID`, `LINK_LANGUAGE`, and `LINK_LANG_AND_ID` generator expressions, since these are supported by the generator. Fixes: #24262
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorExpressionNode.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 4c6dda9..5d761ac 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1468,7 +1468,8 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
genName.find("Ninja") == std::string::npos &&
genName.find("Visual Studio") == std::string::npos &&
genName.find("Xcode") == std::string::npos &&
- genName.find("Watcom WMake") == std::string::npos) {
+ genName.find("Watcom WMake") == std::string::npos &&
+ genName.find("Green Hills MULTI") == std::string::npos) {
reportError(context, content->GetOriginalExpression(),
"$<COMPILE_LANGUAGE:...> not supported for this generator.");
return std::string();
@@ -1516,7 +1517,8 @@ static const struct CompileLanguageAndIdNode : public cmGeneratorExpressionNode
genName.find("Ninja") == std::string::npos &&
genName.find("Visual Studio") == std::string::npos &&
genName.find("Xcode") == std::string::npos &&
- genName.find("Watcom WMake") == std::string::npos) {
+ genName.find("Watcom WMake") == std::string::npos &&
+ genName.find("Green Hills MULTI") == std::string::npos) {
reportError(
context, content->GetOriginalExpression(),
"$<COMPILE_LANG_AND_ID:lang,id> not supported for this generator.");
@@ -1569,7 +1571,8 @@ static const struct LinkLanguageNode : public cmGeneratorExpressionNode
genName.find("Ninja") == std::string::npos &&
genName.find("Visual Studio") == std::string::npos &&
genName.find("Xcode") == std::string::npos &&
- genName.find("Watcom WMake") == std::string::npos) {
+ genName.find("Watcom WMake") == std::string::npos &&
+ genName.find("Green Hills MULTI") == std::string::npos) {
reportError(context, content->GetOriginalExpression(),
"$<LINK_LANGUAGE:...> not supported for this generator.");
return std::string();
@@ -1658,7 +1661,8 @@ static const struct LinkLanguageAndIdNode : public cmGeneratorExpressionNode
genName.find("Ninja") == std::string::npos &&
genName.find("Visual Studio") == std::string::npos &&
genName.find("Xcode") == std::string::npos &&
- genName.find("Watcom WMake") == std::string::npos) {
+ genName.find("Watcom WMake") == std::string::npos &&
+ genName.find("Green Hills MULTI") == std::string::npos) {
reportError(
context, content->GetOriginalExpression(),
"$<LINK_LANG_AND_ID:lang,id> not supported for this generator.");