diff options
| author | Brad King <brad.king@kitware.com> | 2012-04-19 13:33:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-04-19 13:33:29 (GMT) |
| commit | 8787f946b73315d84649bd9818a8225a772c7c36 (patch) | |
| tree | 77d1a25c564619c591221476fabed173ecca7215 /Tests/RunCMake/CMakeLists.txt | |
| parent | 4a30258d91818eb1c1d6741b5a47c54cbfab3313 (diff) | |
| parent | 05604eb9cb7ced290af67dcc392f0a9a10e64386 (diff) | |
| download | CMake-8787f946b73315d84649bd9818a8225a772c7c36.zip CMake-8787f946b73315d84649bd9818a8225a772c7c36.tar.gz CMake-8787f946b73315d84649bd9818a8225a772c7c36.tar.bz2 | |
Merge branch 'list-empty-error' into enhance-include_external_msproject
Resolve conflict in Tests/RunCMake/CMakeLists.txt by adding both tests.
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 4e1660c..1c6db39 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -49,6 +49,7 @@ add_RunCMake_test(ObjectLibrary) add_RunCMake_test(build_command) add_RunCMake_test(find_package) +add_RunCMake_test(list) if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]") add_RunCMake_test(include_external_msproject) |