diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-01-10 16:11:12 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-01-10 16:13:19 (GMT) |
| commit | 93034a8350102e308fa5bca8d89bf3f6fae12771 (patch) | |
| tree | dfd25cf85e72a644afb910289b0aaa6dcbe136a5 /Tests/ExportImport | |
| parent | 378899ce8744c2e2b43d0859234eea714dcef368 (diff) | |
| download | CMake-93034a8350102e308fa5bca8d89bf3f6fae12771.zip CMake-93034a8350102e308fa5bca8d89bf3f6fae12771.tar.gz CMake-93034a8350102e308fa5bca8d89bf3f6fae12771.tar.bz2 | |
Fix linking to imported libraries test.
Make a C executable instead of attempting to make a C++ static
library (and not really succeeding). This was introduced in
commit 894f52f3 (Handle INTERFACE properties transitively for
includes and defines., 2012-09-23).
Diffstat (limited to 'Tests/ExportImport')
| -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(); } |