diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 17:23:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-07 12:52:42 (GMT) |
| commit | 93790506f52cb4e420be6a1a6988613380ecb1bc (patch) | |
| tree | 873c637de69ee4a256cfe68ea584bb73a697a6e1 /Tests/RunCMake | |
| parent | b5b098ebb39c97f3420eb7c24f0d4d5bc2d15a5a (diff) | |
| download | CMake-93790506f52cb4e420be6a1a6988613380ecb1bc.zip CMake-93790506f52cb4e420be6a1a6988613380ecb1bc.tar.gz CMake-93790506f52cb4e420be6a1a6988613380ecb1bc.tar.bz2 | |
cmTarget: Simplify INTERFACE_INCLUDE_DIRECTORIES usage requirement lookup
Use the AddInterfaceEntries helper to avoid duplication. In
TargetPropertyEntry, replace the TargetName string member with a
reference to the full cmLinkImplItem that produced the entry. This is
possible because the cmLinkImplItem is available in AddInterfaceEntries
(it was not available in GetIncludeDirectories). Having the full
cmLinkImplItem allows processIncludeDirectories to implement CMP0027 OLD
behavior without repeating the target name lookup.
Update the RunCMake.CompatibleInterface test DebugProperties case
expected output for the new order of the messages.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt b/Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt index 82a34d5..17b8a5c 100644 --- a/Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt +++ b/Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt @@ -1,11 +1,4 @@ CMake Debug Log: - Boolean compatibility of property "BOOL_PROP7" for target - "CompatibleInterface" \(result: "FALSE"\): - - \* Target "CompatibleInterface" property is implied by use. - \* Target "iface1" property value "FALSE" \(Agree\) -+ -CMake Debug Log: Boolean compatibility of property "BOOL_PROP1" for target "CompatibleInterface" \(result: "TRUE"\): @@ -47,6 +40,13 @@ CMake Debug Log: \* Target "iface2" property value "FALSE" \(Agree\) + CMake Debug Log: + Boolean compatibility of property "BOOL_PROP7" for target + "CompatibleInterface" \(result: "FALSE"\): + + \* Target "CompatibleInterface" property is implied by use. + \* Target "iface1" property value "FALSE" \(Agree\) ++ +CMake Debug Log: String compatibility of property "STRING_PROP1" for target "CompatibleInterface" \(result: "prop1"\): |