[llvm] r279776 - [CMake] Add support for exposing runtime targets

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Thu Aug 25 15:49:51 2016
New Revision: 279776

URL: http://llvm.org/viewvc/llvm-project?rev=279776&view=rev
Log:
[CMake] Add support for exposing runtime targets

This patch adds support to the runtimes build for exposing sub-project targets through the high-level configuration. This will enable exposing the build, check and install targets for sub-project components (i.e. asan, check-asan, install-asan...).

This patch requires minor changes to the runtime projects to take advantage of it, and I'll phase those changes into Compiler-RT shortly.

Added:
    llvm/trunk/runtimes/Components.cmake.in
Modified:
    llvm/trunk/runtimes/CMakeLists.txt

Modified: llvm/trunk/runtimes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtimes/CMakeLists.txt?rev=279776&r1=279775&r2=279776&view=diff
==============================================================================
--- llvm/trunk/runtimes/CMakeLists.txt (original)
+++ llvm/trunk/runtimes/CMakeLists.txt Thu Aug 25 15:49:51 2016
@@ -19,6 +19,10 @@ endforeach()
 # triggered by the external project call for the runtimes target below.
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 
+  function(runtime_register_component name)
+    set_property(GLOBAL APPEND PROPERTY SUB_COMPONENTS ${name})
+  endfunction()
+
   cmake_minimum_required(VERSION 3.4.3)
 
   # Add the root project's CMake modules, and the LLVM build's modules to the
@@ -71,19 +75,44 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
     list(APPEND RUNTIMES_LIT_EXTRA_ARGS ${LLVM_LIT_EXTRA_ARGS})
   endforeach()
 
-  # Add a global check rule now that all subdirectories have been traversed
-  # and we know the total set of lit testsuites.
-  
-  add_lit_target(check-runtimes
-    "Running all regression tests"
-    ${RUNTIMES_LIT_TESTSUITES}
-    PARAMS ${RUNTIMES_LIT_PARAMS}
-    DEPENDS ${RUNTIMES_LIT_DEPENDS}
-    ARGS ${RUNTIMES_LIT_EXTRA_ARGS}
-    )
-  add_custom_target(test-depends-runtimes DEPENDS ${RUNTIMES_LIT_DEPENDS})
+  if(LLVM_INCLUDE_TESTS)
+    # Add a global check rule now that all subdirectories have been traversed
+    # and we know the total set of lit testsuites.
+    
+    add_lit_target(check-runtimes
+      "Running all regression tests"
+      ${RUNTIMES_LIT_TESTSUITES}
+      PARAMS ${RUNTIMES_LIT_PARAMS}
+      DEPENDS ${RUNTIMES_LIT_DEPENDS}
+      ARGS ${RUNTIMES_LIT_EXTRA_ARGS}
+      )
+    add_custom_target(test-depends-runtimes DEPENDS ${RUNTIMES_LIT_DEPENDS})
+  endif()
+
+  get_property(SUB_COMPONENTS GLOBAL PROPERTY SUB_COMPONENTS)
+  list(REMOVE_DUPLICATES SUB_COMPONENTS)
+  foreach(component ${SUB_COMPONENTS})
+    if(NOT TARGET ${component})
+      message(SEND_ERROR "Missing target for runtime component ${component}!")
+      continue()
+    endif()
+    if(LLVM_INCLUDE_TESTS AND NOT TARGET check-${component})
+      message(SEND_ERROR "Missing check target for runtime component ${component}!")
+      continue()
+    endif()
+
+    if(TARGET install-${component})
+      list(APPEND SUB_INSTALL_TARGETS install-${component})
+    endif()
+  endforeach()
+
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Components.cmake.in
+    ${LLVM_BINARY_DIR}/runtimes/Components.cmake)
 
 else() # if this is included from LLVM's CMake
+  include(${LLVM_BINARY_DIR}/runtimes/Components.cmake OPTIONAL)
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/Components.cmake)
   include(LLVMExternalProjectUtils)
 
   # If compiler-rt is present we need to build the builtin libraries first. This
@@ -134,6 +163,8 @@ else() # if this is included from LLVM's
                              EXTRA_TARGETS ${extra_targets}
                                             test-depends-runtimes
                                             check-runtimes
+                                            ${SUB_COMPONENTS}
+                                            ${SUB_INSTALL_TARGETS}
                              USE_TOOLCHAIN)
     set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS test-depends-runtimes)
 

Added: llvm/trunk/runtimes/Components.cmake.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtimes/Components.cmake.in?rev=279776&view=auto
==============================================================================
--- llvm/trunk/runtimes/Components.cmake.in (added)
+++ llvm/trunk/runtimes/Components.cmake.in Thu Aug 25 15:49:51 2016
@@ -0,0 +1,2 @@
+set(SUB_COMPONENTS @SUB_COMPONENTS@)
+set(SUB_INSTALL_TARGETS @SUB_INSTALL_TARGETS@)