diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-10-24 17:00:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-24 17:34:30 (GMT) |
| commit | d1b62185d6b66b27a3ef31b79d4cff1c5126793e (patch) | |
| tree | 185253b09d268bb4b815b9d6b61a03777cfb538a /Tests/RunCMake/set/RunCMakeTest.cmake | |
| parent | 5f414cefb6524d26329484b296004e3c2d97ec4f (diff) | |
| parent | e0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96 (diff) | |
| download | CMake-d1b62185d6b66b27a3ef31b79d4cff1c5126793e.zip CMake-d1b62185d6b66b27a3ef31b79d4cff1c5126793e.tar.gz CMake-d1b62185d6b66b27a3ef31b79d4cff1c5126793e.tar.bz2 | |
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 'Tests/RunCMake/set/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/set/RunCMakeTest.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/set/RunCMakeTest.cmake b/Tests/RunCMake/set/RunCMakeTest.cmake index 1b51ea2..b8e8cf1 100644 --- a/Tests/RunCMake/set/RunCMakeTest.cmake +++ b/Tests/RunCMake/set/RunCMakeTest.cmake @@ -1,3 +1,5 @@ include(RunCMake) run_cmake(ParentScope) +run_cmake(ParentPulling) +run_cmake(ParentPullingRecursive) |