diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-21 11:26:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-21 11:26:41 (GMT) |
| commit | 19a0b5c54427101df656c39bfe9f76fc32c6d221 (patch) | |
| tree | c688faa3195baa8f5933ff5165ed8f5465230cf1 /Source | |
| parent | dae9fd0d28bd5dea8021bb8bb6808fab940d8fa2 (diff) | |
| parent | 5da2c7116577dd6407e6093992021cfd972ce08e (diff) | |
| download | CMake-19a0b5c54427101df656c39bfe9f76fc32c6d221.zip CMake-19a0b5c54427101df656c39bfe9f76fc32c6d221.tar.gz CMake-19a0b5c54427101df656c39bfe9f76fc32c6d221.tar.bz2 | |
Merge topic 'ghs-crash' into release-3.18
5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5033
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 358d65a..97580d6 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -550,8 +550,9 @@ void cmGhsMultiTargetGenerator::WriteSources(std::ostream& fout_proj) */ for (auto& sg : groupFilesList) { std::ostream* fout; - bool useProjectFile = cmIsOn(*this->GeneratorTarget->GetProperty( - "GHS_NO_SOURCE_GROUP_FILE")) || + cmProp noSourceGroupFile = + this->GeneratorTarget->GetProperty("GHS_NO_SOURCE_GROUP_FILE"); + bool useProjectFile = (noSourceGroupFile && cmIsOn(*noSourceGroupFile)) || cmIsOn(this->Makefile->GetDefinition("CMAKE_GHS_NO_SOURCE_GROUP_FILE")); if (useProjectFile || sg.empty()) { fout = &fout_proj; |