Merge topic 'handle-CMP0024-in-tests'

310aef9 Make ExportLanguages a subtest of the ObjectLibrary test
30ff6cf Refactor the Plugin test.

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)

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)

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()

Tests/ObjectLibrary/ExportLanguages/a.c

@@ -0,0 +1 @@
+int a(void) { return 0; }

Tests/Plugin/CMakeLists.txt

@@ -50,37 +50,15 @@ if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG AND
   # Verify that targets export with proper IMPORTED SONAME properties.
   export(TARGETS example_mod_1 example_mod_2 NAMESPACE exp_
     FILE ${CMAKE_CURRENT_BINARY_DIR}/mods.cmake)
-  include(${CMAKE_CURRENT_BINARY_DIR}/mods.cmake)
-  get_property(configs TARGET exp_example_mod_1 PROPERTY IMPORTED_CONFIGURATIONS)
-  foreach(c ${configs})
-    string(TOUPPER "${c}" CONFIG)
-    get_property(soname1 TARGET exp_example_mod_1 PROPERTY IMPORTED_SONAME_${CONFIG})
-    get_property(soname2 TARGET exp_example_mod_2 PROPERTY IMPORTED_NO_SONAME_${CONFIG})
-    if(soname1)
-      message(STATUS "exp_example_mod_1 has IMPORTED_SONAME_${CONFIG} as expected: ${soname1}")
-    else()
-      message(SEND_ERROR "exp_example_mod_1 does not have IMPORTED_SONAME_${CONFIG} but should")
-    endif()
-    if(soname2)
-      message(STATUS "exp_example_mod_2 has IMPORTED_NO_SONAME_${CONFIG} as expected: ${soname2}")
-    else()
-      message(SEND_ERROR "exp_example_mod_2 does not have IMPORTED_NO_SONAME_${CONFIG} but should")
-    endif()
-  endforeach()
 
-  # Parse the binary to check for SONAME if possible.
+  include(ExternalProject)
-  if("${CMAKE_EXECUTABLE_FORMAT}" MATCHES "ELF")
+  ExternalProject_Add(PluginTest
-    find_program(READELF_EXE readelf)
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PluginTest"
-    if(READELF_EXE)
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/PluginTest"
-      add_custom_target(check_mod_soname ALL COMMAND
+    DOWNLOAD_COMMAND ""
-        ${CMAKE_COMMAND} -Dreadelf=${READELF_EXE}
+    INSTALL_COMMAND ""
-                         -Dmod1=$<TARGET_FILE:example_mod_1>
+  )
-                         -Dmod2=$<TARGET_FILE:example_mod_2>
+  add_dependencies(PluginTest example_mod_1 example_mod_2)
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/check_mod_soname.cmake
-        )
-      add_dependencies(check_mod_soname example_mod_1 example_mod_2)
-    endif()
-  endif()
 endif()
 
 # TODO:

Tests/Plugin/PluginTest/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(PluginTest)
+
+include(${CMAKE_CURRENT_BINARY_DIR}/../mods.cmake)
+get_property(configs TARGET exp_example_mod_1 PROPERTY IMPORTED_CONFIGURATIONS)
+foreach(c ${configs})
+  string(TOUPPER "${c}" CONFIG)
+  get_property(soname1 TARGET exp_example_mod_1 PROPERTY IMPORTED_SONAME_${CONFIG})
+  get_property(soname2 TARGET exp_example_mod_2 PROPERTY IMPORTED_NO_SONAME_${CONFIG})
+  if(soname1)
+    message(STATUS "exp_example_mod_1 has IMPORTED_SONAME_${CONFIG} as expected: ${soname1}")
+  else()
+    message(SEND_ERROR "exp_example_mod_1 does not have IMPORTED_SONAME_${CONFIG} but should")
+  endif()
+  if(soname2)
+    message(STATUS "exp_example_mod_2 has IMPORTED_NO_SONAME_${CONFIG} as expected: ${soname2}")
+  else()
+    message(SEND_ERROR "exp_example_mod_2 does not have IMPORTED_NO_SONAME_${CONFIG} but should")
+  endif()
+endforeach()
+
+# Parse the binary to check for SONAME if possible.
+if("${CMAKE_EXECUTABLE_FORMAT}" MATCHES "ELF")
+  find_program(READELF_EXE readelf)
+  if(READELF_EXE)
+    add_custom_target(check_mod_soname ALL COMMAND
+      ${CMAKE_COMMAND} -Dreadelf=${READELF_EXE}
+                        -Dmod1=$<TARGET_FILE:exp_example_mod_1>
+                        -Dmod2=$<TARGET_FILE:exp_example_mod_2>
+      -P ${CMAKE_CURRENT_SOURCE_DIR}/../check_mod_soname.cmake
+      )
+  endif()
+endif()

Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake

@@ -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()

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)