diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-18 10:42:00 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-23 09:42:24 +0100 |
| commit | 8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2 (patch) | |
| tree | b0a35c218afa9e302c5ed11a512fc35f7554b4f2 /Tests/GeneratorExpression | |
| parent | 98a672528d7e6c192fc75abb10161121c8b28073 (diff) | |
| download | cmake-8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2.tar.gz | |
Fix the tests for evaluating includes and defines.
We should also check whether the INTERFACE_ variant of a property
is being read, and in the case of the compile definitions, we should
test the _<CONFIG> suffixed variants. That is already available
through the use of the methods.
This way, we use the ALREADY_SEEN optimization when evaluating
the includes of a target in 'external' generator expressions, ie, those
used in a add_custom_command invokation, as opposed to evaluating the
INCLUDE_DIRECTORIES of a target itself via GetIncludeDirectories.
Diffstat (limited to 'Tests/GeneratorExpression')
| -rw-r--r-- | Tests/GeneratorExpression/check-part2.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tests/GeneratorExpression/check-part2.cmake b/Tests/GeneratorExpression/check-part2.cmake index 44ded62b61..3f7187ca24 100644 --- a/Tests/GeneratorExpression/check-part2.cmake +++ b/Tests/GeneratorExpression/check-part2.cmake @@ -26,11 +26,11 @@ check(test_build_interface "build") check(test_install_interface "") check(test_target_name_1 "tgt,ok") check(test_target_name_2 "tgt:ok") -check(test_target_includes1 "/empty1/public;/empty2/public;/empty3/public;/empty4/public;/empty4/public") -check(test_target_includes2 "/empty2/public;/empty3/public;/empty4/public;/empty4/public") -check(test_target_includes3 "/empty3/public;/empty2/public;/empty4/public;/empty4/public") +check(test_target_includes1 "/empty1/public;/empty2/public;/empty3/public;/empty4/public") +check(test_target_includes2 "/empty2/public;/empty3/public;/empty4/public") +check(test_target_includes3 "/empty3/public;/empty2/public;/empty4/public") check(test_target_includes4 "/empty1/public;/empty1/private;/empty2/public;/empty3/public;/empty4/public") check(test_target_includes5 "/empty2/public;/empty3/public;/empty2/public;/empty4/public") check(test_target_includes6 "/empty3/public;/empty3/private;/empty2/public;/empty3/public;/empty4/public") -check(test_target_includes7 "/empty1/public;/empty2/public;/empty3/public;/empty4/public;/empty4/public") +check(test_target_includes7 "/empty1/public;/empty2/public;/empty3/public;/empty4/public") check(test_target_includes8 "/empty5/private1;/empty5/private2") |