summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-09-10 21:00:27 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-09-11 17:12:46 (GMT)
commitfb45c37160e4f8d839a2c29bce80cae7563cfd3a (patch)
tree255e5bd6a9065cc123a531def2a1d78186c5f56b
parent158f7e31dc685859f5a53d88e965382c6361efb1 (diff)
downloadCMake-fb45c37160e4f8d839a2c29bce80cae7563cfd3a.zip
CMake-fb45c37160e4f8d839a2c29bce80cae7563cfd3a.tar.gz
CMake-fb45c37160e4f8d839a2c29bce80cae7563cfd3a.tar.bz2
cmState: Only append non-empty values to buildsystem properties.
This is a change in behavior from CMake 3.3, but there is no semantic meaning to empty entries in buildsystem properties. This also restores behavior to that of CMake 2.8.10.
-rw-r--r--Source/cmState.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index b66f403..f8971ad 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1378,6 +1378,11 @@ template <typename T, typename U, typename V>
void AppendEntry(T& content, U& backtraces, V& endContentPosition,
const std::string& value, const cmListFileBacktrace& lfbt)
{
+ if (value.empty())
+ {
+ return;
+ }
+
assert(endContentPosition == content.size());
content.push_back(value);