diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-11 16:32:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-11 16:32:09 (GMT) |
| commit | ffe93315a2554c16f7bb46a35a848602cea229f9 (patch) | |
| tree | dc961a2db2ab9c491e30789a1a398c79c01a4dc0 | |
| parent | 5929086634e362d03d02124eea5ee14919ae5a0f (diff) | |
| parent | 93034a8350102e308fa5bca8d89bf3f6fae12771 (diff) | |
| download | CMake-ffe93315a2554c16f7bb46a35a848602cea229f9.zip CMake-ffe93315a2554c16f7bb46a35a848602cea229f9.tar.gz CMake-ffe93315a2554c16f7bb46a35a848602cea229f9.tar.bz2 | |
Merge topic 'fix-imported-lib-linking-test'
93034a8 Fix linking to imported libraries test.
| -rw-r--r-- | Tests/ExportImport/Import/A/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/deps_iface.c (renamed from Tests/ExportImport/Import/A/deps_iface.cpp) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt index b77562e..56cfea0 100644 --- a/Tests/ExportImport/Import/A/CMakeLists.txt +++ b/Tests/ExportImport/Import/A/CMakeLists.txt @@ -157,8 +157,8 @@ endif() # Test that dependent imported targets have usable # INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES -add_library(deps_iface deps_iface.cpp) -target_link_libraries(deps_iface testLibsDepends) +add_executable(deps_iface deps_iface.c) +target_link_libraries(deps_iface testLibDepends) set_property(TARGET deps_iface APPEND PROPERTY COMPILE_DEFINITIONS $<TARGET_PROPERTY:testLibDepends,INTERFACE_COMPILE_DEFINITIONS> diff --git a/Tests/ExportImport/Import/A/deps_iface.cpp b/Tests/ExportImport/Import/A/deps_iface.c index 7190b92..e73ca26 100644 --- a/Tests/ExportImport/Import/A/deps_iface.cpp +++ b/Tests/ExportImport/Import/A/deps_iface.c @@ -18,7 +18,7 @@ extern int testLibDepends(void); -int main(int,char **) +int main() { return testLibDepends(); } |