diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-26 14:28:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-26 14:28:55 (GMT) |
| commit | bd48b8a8ceb80e965d8ab946620873d0603060ae (patch) | |
| tree | afe637a59189fd24247d0a0b099b8d1f5c41bbd4 /Tests/RunCMake | |
| parent | cd553c34d618afba1312f4a4b1d289c7ba094d63 (diff) | |
| parent | 310aef959b6e41d60f35eec4b4a2e5698aa42abe (diff) | |
| download | CMake-bd48b8a8ceb80e965d8ab946620873d0603060ae.zip CMake-bd48b8a8ceb80e965d8ab946620873d0603060ae.tar.gz CMake-bd48b8a8ceb80e965d8ab946620873d0603060ae.tar.bz2 | |
Merge topic 'handle-CMP0024-in-tests'
310aef9 Make ExportLanguages a subtest of the ObjectLibrary test
30ff6cf Refactor the Plugin test.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake | 15 | ||||
| -rw-r--r-- | Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ObjectLibrary/a.cxx | 1 |
3 files changed, 0 insertions, 17 deletions
diff --git a/Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake b/Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake deleted file mode 100644 index 0796c21..0000000 --- a/Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake +++ /dev/null @@ -1,15 +0,0 @@ -enable_language(CXX) -add_library(A OBJECT a.cxx) -add_library(B STATIC a.c $<TARGET_OBJECTS:A>) - -# Verify that object library languages are propagated. -export(TARGETS B NAMESPACE Exp FILE BExport.cmake) -include(${CMAKE_CURRENT_BINARY_DIR}/BExport.cmake) -get_property(configs TARGET ExpB PROPERTY IMPORTED_CONFIGURATIONS) -foreach(c ${configs}) - get_property(langs TARGET ExpB PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES_${c}) - list(FIND langs CXX pos) - if(${pos} LESS 0) - message(FATAL_ERROR "Target export does not list object library languages.") - endif() -endforeach() diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake index 55db14d..a74eaa8 100644 --- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake +++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake @@ -6,7 +6,6 @@ run_cmake(BadSourceExpression3) run_cmake(BadObjSource1) run_cmake(BadObjSource2) run_cmake(Export) -run_cmake(ExportLanguages) run_cmake(Import) run_cmake(Install) run_cmake(LinkObjLHS) diff --git a/Tests/RunCMake/ObjectLibrary/a.cxx b/Tests/RunCMake/ObjectLibrary/a.cxx deleted file mode 100644 index ae9c87c..0000000 --- a/Tests/RunCMake/ObjectLibrary/a.cxx +++ /dev/null @@ -1 +0,0 @@ -extern "C" int acxx(void) { return 0; } |