diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-08-18 00:54:47 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2018-08-18 00:54:47 (GMT) |
| commit | 7e919ace319514282209663767525fb3855e5fa4 (patch) | |
| tree | 5464e19a76d6eab306a1140bb6abdb7e0c8e5e8a /Source | |
| parent | c4ab098097f4fe1bc85ee29c6de390dff435f63f (diff) | |
| parent | dbd3e2c53d2fb0c19a08a0fe8780df5eb4f89476 (diff) | |
| download | CMake-7e919ace319514282209663767525fb3855e5fa4.zip CMake-7e919ace319514282209663767525fb3855e5fa4.tar.gz CMake-7e919ace319514282209663767525fb3855e5fa4.tar.bz2 | |
Merge branch 'export-properties-undefined' into release-3.12
Merge-request: !2294
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 5f61571..9e6560f 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -1143,6 +1143,11 @@ bool cmExportFileGenerator::PopulateExportProperties( return false; } auto propertyValue = targetProperties.GetPropertyValue(prop); + if (propertyValue == nullptr) { + // Asked to export a property that isn't defined on the target. Do not + // consider this an error, there's just nothing to export. + continue; + } std::string evaluatedValue = cmGeneratorExpression::Preprocess( propertyValue, cmGeneratorExpression::StripAllGeneratorExpressions); if (evaluatedValue != propertyValue) { |