diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-01 13:24:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-01 13:24:08 (GMT) |
| commit | 22e67bc6bb138d1fb09555f1fdeaaba14312d3da (patch) | |
| tree | c1a03cd2832d7696c7bbd4a3abbc70e75ef49962 /Tests | |
| parent | e61c1cf64c4f39b00e0f8ed81466e85c773d9ba2 (diff) | |
| parent | 8112059ee7f38f0eb5cdcaba8185aec659abcbfc (diff) | |
| download | CMake-22e67bc6bb138d1fb09555f1fdeaaba14312d3da.zip CMake-22e67bc6bb138d1fb09555f1fdeaaba14312d3da.tar.gz CMake-22e67bc6bb138d1fb09555f1fdeaaba14312d3da.tar.bz2 | |
Merge topic 'simplify_target_link_libraries'
8112059e target_link_libraries: Simplify implementation and add comments.
b0e2f141 target_link_libraries: Slightly fix some error-messages.
85457b63 target_link_libraries: Return earlier on some error.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1531
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/target_link_libraries/MixedSignature-stderr.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt b/Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt index 8809f89..d5ee4f9 100644 --- a/Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt +++ b/Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt @@ -1,6 +1,6 @@ CMake Error at LinkObjRHS1.cmake:3 \(target_link_libraries\): Target "AnObjLib" of type OBJECT_LIBRARY may not be linked into another - target. One may link only to STATIC or SHARED libraries, or to executables - with the ENABLE_EXPORTS property set. + target. One may link only to INTERFACE, STATIC or SHARED libraries, or to + executables with the ENABLE_EXPORTS property set. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/target_link_libraries/MixedSignature-stderr.txt b/Tests/RunCMake/target_link_libraries/MixedSignature-stderr.txt index a0c66db..c6237f4 100644 --- a/Tests/RunCMake/target_link_libraries/MixedSignature-stderr.txt +++ b/Tests/RunCMake/target_link_libraries/MixedSignature-stderr.txt @@ -1,5 +1,5 @@ CMake Error at MixedSignature.cmake:6 \(target_link_libraries\): - The PUBLIC or PRIVATE option must appear as the second argument, just after - the target name. + The INTERFACE, PUBLIC or PRIVATE option must appear as the second argument, + just after the target name. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) |