diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-04-23 16:47:22 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-04-23 16:47:22 (GMT) |
| commit | d837f8b6fb30c34e167c35f7e85ac3b7b19adccf (patch) | |
| tree | 019af81ce98a755600df6a5b83efcfd312797961 /Source/cmQTWrapCPPCommand.cxx | |
| parent | b45976fe104902ed7f0495e0e4c822684a4455e7 (diff) | |
| parent | 61ac8e6dfa06d82ff2ef3ae3f0076fb9aa65d542 (diff) | |
| download | CMake-d837f8b6fb30c34e167c35f7e85ac3b7b19adccf.zip CMake-d837f8b6fb30c34e167c35f7e85ac3b7b19adccf.tar.gz CMake-d837f8b6fb30c34e167c35f7e85ac3b7b19adccf.tar.bz2 | |
Merge branch 'master' into ninja-order-only-fix
Diffstat (limited to 'Source/cmQTWrapCPPCommand.cxx')
| -rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index cc4df8f..48c4b10 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -39,7 +39,8 @@ bool cmQTWrapCPPCommand(std::vector<std::string> const& args, cmStrCat(mf.GetCurrentBinaryDirectory(), "/moc_", srcName, ".cxx"); cmSourceFile* sf = mf.GetOrCreateSource(newName, true); if (curr) { - sf->SetProperty("ABSTRACT", curr->GetProperty("ABSTRACT")); + cmProp p = curr->GetProperty("ABSTRACT"); + sf->SetProperty("ABSTRACT", p ? p->c_str() : nullptr); } // Compute the name of the header from which to generate the file. |