diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-27 12:32:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-27 12:32:26 (GMT) |
| commit | 8eb64831bec333914aab3af54e2d1deded02eb90 (patch) | |
| tree | fa90031d682546d1b491be67c481a394edf18861 /Source/cmMakefile.cxx | |
| parent | 21cf9364f092004a027f11b5bf574804cc8cfded (diff) | |
| parent | d1b62185d6b66b27a3ef31b79d4cff1c5126793e (diff) | |
| download | CMake-8eb64831bec333914aab3af54e2d1deded02eb90.zip CMake-8eb64831bec333914aab3af54e2d1deded02eb90.tar.gz CMake-8eb64831bec333914aab3af54e2d1deded02eb90.tar.bz2 | |
Merge topic 'revert-definition-map-lookup'
d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure
5f414cef Revert "cmDefinitions: Don't store parent lookups"
e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes
064c415d test: add test for PARENT_SCOPE behavior
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8cc1e88..8a8aadc 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4476,7 +4476,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); |