summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-10-24 16:58:12 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-24 17:31:21 (GMT)
commit5f414cefb6524d26329484b296004e3c2d97ec4f (patch)
tree6a6edc8f85577dcf22f157488bb809e8733b2cbb /Source/cmMakefile.cxx
parent5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49 (diff)
downloadCMake-5f414cefb6524d26329484b296004e3c2d97ec4f.zip
CMake-5f414cefb6524d26329484b296004e3c2d97ec4f.tar.gz
CMake-5f414cefb6524d26329484b296004e3c2d97ec4f.tar.bz2
Revert "cmDefinitions: Don't store parent lookups"
This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 412c998..630957f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4422,7 +4422,7 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef)
if(cmDefinitions* up = cur.GetParent())
{
// First localize the definition in the current scope.
- cur.Pull(var);
+ cur.Get(var);
// Now update the definition in the parent scope.
up->Set(var, varDef);