summaryrefslogtreecommitdiff
path: root/Source/cmDefinitions.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-10-24 13:00:28 -0400
committerBrad King <brad.king@kitware.com>2014-10-24 13:34:30 -0400
commitd1b62185d6b66b27a3ef31b79d4cff1c5126793e (patch)
tree185253b09d268bb4b815b9d6b61a03777cfb538a /Source/cmDefinitions.cxx
parent5f414cefb6524d26329484b296004e3c2d97ec4f (diff)
parente0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96 (diff)
downloadcmake-d1b62185d6b66b27a3ef31b79d4cff1c5126793e.tar.gz
Merge branch 'parent-scope-tests' into variable-pull-failure
* parent-scope-tests: test: add a test for PARENT_SCOPE with multiple scopes test: add test for PARENT_SCOPE behavior Conflicts: Tests/RunCMake/set/RunCMakeTest.cmake
Diffstat (limited to 'Source/cmDefinitions.cxx')
0 files changed, 0 insertions, 0 deletions