[llvm] r279857 - [CMake] Fixing LLVM_INCLUDE_TESTS for runtimes directory

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Fri Aug 26 15:08:57 2016
New Revision: 279857

URL: http://llvm.org/viewvc/llvm-project?rev=279857&view=rev
Log:
[CMake] Fixing LLVM_INCLUDE_TESTS for runtimes directory

We need to explicitly pass LLVM_INCLUDE_TESTS through from the top-level to the runtimes configuration because it isn't in LLVMConfig.cmake

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=279857&r1=279856&r2=279857&view=diff
==============================================================================
--- llvm/trunk/runtimes/CMakeLists.txt (original)
+++ llvm/trunk/runtimes/CMakeLists.txt Fri Aug 26 15:08:57 2016
@@ -86,7 +86,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
       DEPENDS ${RUNTIMES_LIT_DEPENDS}
       ARGS ${RUNTIMES_LIT_EXTRA_ARGS}
       )
-    add_custom_target(test-depends-runtimes DEPENDS ${RUNTIMES_LIT_DEPENDS})
+    add_custom_target(runtimes-test-depends DEPENDS ${RUNTIMES_LIT_DEPENDS})
   endif()
 
   get_property(SUB_COMPONENTS GLOBAL PROPERTY SUB_COMPONENTS)
@@ -151,6 +151,10 @@ else() # if this is included from LLVM's
         check-${runtime_name})
     endforeach()
 
+    if(LLVM_INCLUDE_TESTS)
+      set(test_targets runtimes-test-depends check-runtimes)
+    endif()
+
     # Create a runtimes target that uses this file as its top-level CMake file.
     # The runtimes target is a configuration of all the runtime libraries
     # together in a single CMake invocaiton.
@@ -159,14 +163,15 @@ else() # if this is included from LLVM's
                              DEPENDS ${deps}
                              # Builtins were built separately above
                              CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
+                                        -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
                              PASSTHROUGH_PREFIXES ${prefixes}
                              EXTRA_TARGETS ${extra_targets}
-                                            test-depends-runtimes
-                                            check-runtimes
+                                            ${test_targets}
                                             ${SUB_COMPONENTS}
                                             ${SUB_INSTALL_TARGETS}
                              USE_TOOLCHAIN)
-    set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS test-depends-runtimes)
-
+    if(LLVM_INCLUDE_TESTS)
+      set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS runtimes-test-depends)
+    endif()
   endif()
 endif()