diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-14 13:19:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-14 13:19:59 (GMT) |
| commit | 31117bb17c4e764bb60b8c9c6847a631cc9ecf3c (patch) | |
| tree | 7d5344a424d0993e66414739d24bd02d6749e449 /Source/cmState.cxx | |
| parent | 75ad8d342119be9e71006c2f352755ad9565963b (diff) | |
| parent | ed258d606b87dacc465dad73b04f1c3e270b627c (diff) | |
| download | CMake-31117bb17c4e764bb60b8c9c6847a631cc9ecf3c.zip CMake-31117bb17c4e764bb60b8c9c6847a631cc9ecf3c.tar.gz CMake-31117bb17c4e764bb60b8c9c6847a631cc9ecf3c.tar.bz2 | |
Merge topic 'fix-buildsystem-property-append'
ed258d60 Tests: Cover set_property for buildsystem directory properties
fb45c371 cmState: Only append non-empty values to buildsystem properties.
158f7e31 cmMakefile: Use appropriate parameter name.
08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 63909ab..ce9ff32 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1377,11 +1377,16 @@ cmBacktraceRange GetPropertyBacktraces(T const& content, template <typename T, typename U, typename V> void AppendEntry(T& content, U& backtraces, V& endContentPosition, - const std::string& vec, const cmListFileBacktrace& lfbt) + const std::string& value, const cmListFileBacktrace& lfbt) { + if (value.empty()) + { + return; + } + assert(endContentPosition == content.size()); - content.push_back(vec); + content.push_back(value); backtraces.push_back(lfbt); endContentPosition = content.size(); |