summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGhsMultiGenerator.cxx
diff options
context:
space:
mode:
authorFred Baksik <frodak17@gmail.com>2019-04-08 13:55:35 (GMT)
committerFred Baksik <frodak17@gmail.com>2019-04-11 17:15:51 (GMT)
commit3b415c60c1a02b9ac76089a44c28e70692dcdef1 (patch)
treecdfb9a96bb27861a70dc1c759bc3b33b577b2120 /Source/cmGlobalGhsMultiGenerator.cxx
parent83c47ef5b8a6b1a63edbd82092d8eae68da453d6 (diff)
downloadCMake-3b415c60c1a02b9ac76089a44c28e70692dcdef1.zip
CMake-3b415c60c1a02b9ac76089a44c28e70692dcdef1.tar.gz
CMake-3b415c60c1a02b9ac76089a44c28e70692dcdef1.tar.bz2
GHS: Update ExternalProject for GHS tools
-- When using default values for the external project forward GHS platform variables so that the external project builds with the same tools as the original project. -- Fix issue with bad top level project when GHS_PRIMARY_TARGET is set but has no value. In this case treat it as unset and use default value.
Diffstat (limited to 'Source/cmGlobalGhsMultiGenerator.cxx')
-rw-r--r--Source/cmGlobalGhsMultiGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index f9d7e75..b69dea0 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -638,7 +638,7 @@ void cmGlobalGhsMultiGenerator::WriteHighLevelDirectives(
std::string tgt;
const char* t =
this->GetCMakeInstance()->GetCacheDefinition("GHS_PRIMARY_TARGET");
- if (t) {
+ if (t && *t != '\0') {
tgt = t;
this->GetCMakeInstance()->MarkCliAsUsed("GHS_PRIMARY_TARGET");
} else {