diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-11 14:02:45 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-11 15:15:33 -0500 |
| commit | f30022eb07b913598326d2e3b10ff2e706fbe873 (patch) | |
| tree | c4b40ec96cd6affe7b091548540e5ac0df659ce3 /Tests/ExportImport/Import | |
| parent | 7607c3d16aa0636458c909f4036e4b0d91581b30 (diff) | |
| download | cmake-f30022eb07b913598326d2e3b10ff2e706fbe873.tar.gz | |
install: Allow generator expressions in TARGETS DESTINATION (#14317)
This will allow per-config destinations for targets in EXPORT sets.
Using multiple install(TARGETS) with separate CONFIGURATIONS is
rejected as a target appearing more than once in an export set.
Now instead one can write
install(TARGETS foo EXPORT exp DESTINATION lib/$<CONFIG>)
to get a single logical membership of the target in the export set
while still having a per-config destination.
Diffstat (limited to 'Tests/ExportImport/Import')
| -rw-r--r-- | Tests/ExportImport/Import/A/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/imp_testExe1.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt index 358776bfd8..ced7b03eb3 100644 --- a/Tests/ExportImport/Import/A/CMakeLists.txt +++ b/Tests/ExportImport/Import/A/CMakeLists.txt @@ -34,6 +34,7 @@ target_link_libraries(imp_testExe1 exp_testLib5 exp_testLib6 exp_testLibCycleA + exp_testLibPerConfigDest ) # Try building a plugin to an executable imported from the install tree. @@ -66,6 +67,7 @@ target_link_libraries(imp_testExe1b bld_testLib5 bld_testLib6 bld_testLibCycleA + bld_testLibPerConfigDest ) add_custom_target(check_testLib1_genex ALL diff --git a/Tests/ExportImport/Import/A/imp_testExe1.c b/Tests/ExportImport/Import/A/imp_testExe1.c index 451998ab77..150fcef3e3 100644 --- a/Tests/ExportImport/Import/A/imp_testExe1.c +++ b/Tests/ExportImport/Import/A/imp_testExe1.c @@ -7,6 +7,7 @@ extern int testLib4lib(); extern int testLib5(); extern int testLib6(); extern int testLibCycleA1(); +extern int testLibPerConfigDest(); /* Switch a symbol between debug and optimized builds to make sure the proper library is found from the testLib4 link interface. */ @@ -21,5 +22,6 @@ int main() { return (testLib2() + generated_by_testExe1() + testLib3() + testLib4() + testLib5() + testLib6() + testLibCycleA1() + + testLibPerConfigDest() + generated_by_testExe3() + testLib4lib() + testLib4libcfg()); } |