diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-10-07 22:37:23 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-10-24 19:05:34 +0200 |
| commit | 310aef959b6e41d60f35eec4b4a2e5698aa42abe (patch) | |
| tree | 3ae78b8cf8377230dfdbea7470aeae7018a4a18a /Tests/ObjectLibrary | |
| parent | 30ff6cf9e9b3211a54187e416d6cc2ce9b0e9b77 (diff) | |
| download | cmake-310aef959b6e41d60f35eec4b4a2e5698aa42abe.tar.gz | |
Make ExportLanguages a subtest of the ObjectLibrary test
It was a subtest of the RunCMake.ObjectLibrary test. However, we need
to test a build with ExternalProject after running CMake, which RunCMake tests
do not do.
Diffstat (limited to 'Tests/ObjectLibrary')
| -rw-r--r-- | Tests/ObjectLibrary/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/ExportLanguages/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/ExportLanguages/ExportLanguagesTest/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/ExportLanguages/a.c | 1 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/ExportLanguages/a.cxx | 1 |
5 files changed, 33 insertions, 0 deletions
diff --git a/Tests/ObjectLibrary/CMakeLists.txt b/Tests/ObjectLibrary/CMakeLists.txt index 13a07b44a4..0aeefaa487 100644 --- a/Tests/ObjectLibrary/CMakeLists.txt +++ b/Tests/ObjectLibrary/CMakeLists.txt @@ -58,3 +58,5 @@ target_compile_definitions(ABmain PUBLIC $<TARGET_PROPERTY:B,INTERFACE_COMPILE_D add_executable(UseABinternal ${dummy} $<TARGET_OBJECTS:ABmain> $<TARGET_OBJECTS:A> $<TARGET_OBJECTS:B> ) + +add_subdirectory(ExportLanguages) diff --git a/Tests/ObjectLibrary/ExportLanguages/CMakeLists.txt b/Tests/ObjectLibrary/ExportLanguages/CMakeLists.txt new file mode 100644 index 0000000000..22c92a7f3c --- /dev/null +++ b/Tests/ObjectLibrary/ExportLanguages/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8) +project(ExportLanguages CXX) +add_library(ExportLanguagesA OBJECT a.cxx) +add_library(ExportLanguagesB STATIC a.c $<TARGET_OBJECTS:ExportLanguagesA>) + +# Verify that object library languages are propagated. +export(TARGETS ExportLanguagesB NAMESPACE Exp FILE BExport.cmake) +include(ExternalProject) +ExternalProject_Add(ExportLanguagesTest + SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ExportLanguagesTest" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ExportLanguagesTest" + DOWNLOAD_COMMAND "" + INSTALL_COMMAND "" +) +add_dependencies(ExportLanguagesTest ExportLanguagesA ExportLanguagesB) diff --git a/Tests/ObjectLibrary/ExportLanguages/ExportLanguagesTest/CMakeLists.txt b/Tests/ObjectLibrary/ExportLanguages/ExportLanguagesTest/CMakeLists.txt new file mode 100644 index 0000000000..fc8dd2b78a --- /dev/null +++ b/Tests/ObjectLibrary/ExportLanguages/ExportLanguagesTest/CMakeLists.txt @@ -0,0 +1,14 @@ + +cmake_minimum_required(VERSION 2.8) + +project(ExportLanguagesTest) + +include(${CMAKE_CURRENT_BINARY_DIR}/../BExport.cmake) +get_property(configs TARGET ExpExportLanguagesB PROPERTY IMPORTED_CONFIGURATIONS) +foreach(c ${configs}) + get_property(langs TARGET ExpExportLanguagesB 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/ObjectLibrary/ExportLanguages/a.c b/Tests/ObjectLibrary/ExportLanguages/a.c new file mode 100644 index 0000000000..af20d3ff65 --- /dev/null +++ b/Tests/ObjectLibrary/ExportLanguages/a.c @@ -0,0 +1 @@ +int a(void) { return 0; } diff --git a/Tests/ObjectLibrary/ExportLanguages/a.cxx b/Tests/ObjectLibrary/ExportLanguages/a.cxx new file mode 100644 index 0000000000..ae9c87c496 --- /dev/null +++ b/Tests/ObjectLibrary/ExportLanguages/a.cxx @@ -0,0 +1 @@ +extern "C" int acxx(void) { return 0; } |