diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-19 15:09:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-19 15:09:36 (GMT) |
| commit | 0cbc69b9ea97a44280350a58a365c617896e4589 (patch) | |
| tree | 0e65541d3986b4b86d3d62fe21545bdf7ad5172a /Tests | |
| parent | 56dc91c3adac1abbd2326fe677b6093c997771c1 (diff) | |
| parent | 61d52e6e77bef903225bd3bad3e381bac73ee557 (diff) | |
| download | CMake-0cbc69b9ea97a44280350a58a365c617896e4589.zip CMake-0cbc69b9ea97a44280350a58a365c617896e4589.tar.gz CMake-0cbc69b9ea97a44280350a58a365c617896e4589.tar.bz2 | |
Merge topic 'minor-cleanups'
61d52e6e cmListFileBacktrace: Hide the context-stack implementation detail.
a271f7f1 cmTarget: Simplify CMP0023 message loop.
f4300cd4 cmTarget: Simplify output computation.
65a42849 cmTarget: Store context in stack only if different.
9645cba3 cmListFileContext: Implement EqualityComparable.
52a8d19c cmTarget: Store only cmListFileContext for CMP0023 handling.
59ba1215 cmTarget: Remove needless iteration.
18f810a8 cmListFileContext: Sort by line before file.
e96b5d14 cmListFileContext: Implement LessThanComparable.
7eb0dfa0 cmMakefile: Use std::set::insert API to simplify CMP0054 handling.
f9785e0c cmMakefile: Simplify CMP0054 handling.
e17b5e42 cmMakefile: Add access to the top-level execution context.
1ec1bf9f if(): Test the effect of cmMakefileCall use in elseif() handling.
9b4aefad cmMakefile: Replace deques with vectors.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/if/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/if/elseif-message-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/if/elseif-message-stderr.txt | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/if/elseif-message.cmake | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/if/RunCMakeTest.cmake b/Tests/RunCMake/if/RunCMakeTest.cmake index 6b6b74b..b5546a7 100644 --- a/Tests/RunCMake/if/RunCMakeTest.cmake +++ b/Tests/RunCMake/if/RunCMakeTest.cmake @@ -2,3 +2,4 @@ include(RunCMake) run_cmake(IsDirectory) run_cmake(IsDirectoryLong) +run_cmake(elseif-message) diff --git a/Tests/RunCMake/if/elseif-message-result.txt b/Tests/RunCMake/if/elseif-message-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/if/elseif-message-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/if/elseif-message-stderr.txt b/Tests/RunCMake/if/elseif-message-stderr.txt new file mode 100644 index 0000000..c73977c --- /dev/null +++ b/Tests/RunCMake/if/elseif-message-stderr.txt @@ -0,0 +1,8 @@ +CMake Error at elseif-message.cmake:[0-9]+ \(elseif\): + given arguments: + + "Unknown" "arguments" + + Unknown arguments specified +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/if/elseif-message.cmake b/Tests/RunCMake/if/elseif-message.cmake new file mode 100644 index 0000000..5930966 --- /dev/null +++ b/Tests/RunCMake/if/elseif-message.cmake @@ -0,0 +1,4 @@ + +if (0) +elseif(Unknown arguments) +endif() |