diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-03-14 20:40:21 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-03-18 14:09:47 (GMT) |
| commit | 7a619fa6fbebdd907815be2d0edaef0184a3ad95 (patch) | |
| tree | d23365fec465c80a624c69baa3370b794d223010 /Tests/ExportImport/Export | |
| parent | 55812ab0bcf8655473535c05865a63772fbf6dac (diff) | |
| download | CMake-7a619fa6fbebdd907815be2d0edaef0184a3ad95.zip CMake-7a619fa6fbebdd907815be2d0edaef0184a3ad95.tar.gz CMake-7a619fa6fbebdd907815be2d0edaef0184a3ad95.tar.bz2 | |
Fix cmGeneratorExpression::Preprocess for interleaved inputs.
We can't find both preprocessing expressions at once, because then
the BUILD_INTERFACE will always be favored if both are present, even
if INSTALL_INTERFACE appears first.
This was affecting the behavior of install(EXPORT) because the
INTERFACE_INCLUDE_DIRECTORIES contained entries like
/foo/include;$<INSTALL_INTERFACE:/bar/include>
As the INSTALL_INTERFACE always evaluates to '0', it always needs
to be preprocessed properly.
Diffstat (limited to 'Tests/ExportImport/Export')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index c00ef82..337168f 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -148,6 +148,10 @@ set_property(TARGET testLibRequired APPEND PROPERTY $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired4,INTERFACE_INCLUDE_DIRECTORIES>> $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>> $<INSTALL_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired6,INTERFACE_INCLUDE_DIRECTORIES>> + # The BUILD_INTERFACE entry from above is duplicated below. This is to test that + # the INSTALL_INTERFACE entry bound by a BUILD_INTERFACE entry on either side is + # preprocessed correctly on install(EXPORT). + $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>> # Test that the below is non-fatal $<$<STREQUAL:one,two>:$<TARGET_PROPERTY:not_a_target,INTERFACE_INCLUDE_DIRECTORIES>> ) |