diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-14 13:40:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-14 13:40:19 (GMT) |
| commit | 67b3c271924ca85dfe570bcab4af3778fabfa31a (patch) | |
| tree | fa9903ac156407c4ea392ab0a74bc87aa414cf1e /Source/CPack/cmCPackFreeBSDGenerator.cxx | |
| parent | 0a84ba8590e2474836fd93346015d576e899cd39 (diff) | |
| parent | 202a65759b98ed955af56db0415ae5033a90f740 (diff) | |
| download | CMake-67b3c271924ca85dfe570bcab4af3778fabfa31a.zip CMake-67b3c271924ca85dfe570bcab4af3778fabfa31a.tar.gz CMake-67b3c271924ca85dfe570bcab4af3778fabfa31a.tar.bz2 | |
Merge topic 'refactor-CPack-GetOption-returns-cmProp'
202a65759b cmCPackGenerator::GetOption returns cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6506
Diffstat (limited to 'Source/CPack/cmCPackFreeBSDGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackFreeBSDGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx b/Source/CPack/cmCPackFreeBSDGenerator.cxx index b673006..39ec3c8 100644 --- a/Source/CPack/cmCPackFreeBSDGenerator.cxx +++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx @@ -203,11 +203,11 @@ cmGeneratedFileStream& operator<<(cmGeneratedFileStream& s, // basically a wrapper that handles the NULL-ptr return from GetOption(). std::string cmCPackFreeBSDGenerator::var_lookup(const char* var_name) { - const char* pv = this->GetOption(var_name); + cmProp pv = this->GetOption(var_name); if (!pv) { return std::string(); } - return pv; + return *pv; } // Produce UCL in the given @p manifest file for the common |