[CMake][runtimes] Use target specific name for all runtimes targets

We need to use target specific name for all runtimes targets. Target
specific name means the name of target in the LLVM build is different
from the name in runtimes build (in LLVM build, it's suffixed by the
target itself). Previously we have only used target specific names for
check targets collected through SUB_CHECK_TARGETS, but that's not
sufficient, we need to use target specific names for all targets we're
exposing in LLVM build.

Fixes PR34335.

Differential Revision: https://reviews.llvm.org/D37245

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312405 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt
index 9ae755361ed8c13828c7da8a86018c40f68decee..0af7c47e6fe8a5d39fdc734964d78aab250195a1 100644 (file)
--- a/runtimes/CMakeLists.txt
+++ b/runtimes/CMakeLists.txt
@@ -306,22 +306,24 @@ else() # if this is included from LLVM's CMake
 
     foreach(runtime_name ${runtime_names})
       list(APPEND ${name}_extra_targets
-        ${runtime_name}-${name}
-        install-${runtime_name}-${name})
+        "${runtime_name}:${runtime_name}-${name}"
+        "install-${runtime_name}:install-${runtime_name}-${name}")
       if(LLVM_INCLUDE_TESTS)
-        list(APPEND ${name}_test_targets check-${runtime_name}-${name})
+        list(APPEND ${name}_test_targets "check-${runtime_name}:check-${runtime_name}-${name}")
       endif()
     endforeach()
 
-    foreach(name IN LISTS SUB_COMPONENTS SUB_INSTALL_TARGETS)
-      list(APPEND ${name}_extra_targets "${name}:${name}-${name}")
+    foreach(target_name IN LISTS SUB_COMPONENTS SUB_INSTALL_TARGETS)
+      list(APPEND ${name}_extra_targets "${target_name}:${target_name}-${name}")
     endforeach()
 
     if(LLVM_INCLUDE_TESTS)
-      list(APPEND ${name}_test_targets runtimes-test-depends-${name} check-runtimes-${name})
+      list(APPEND ${name}_test_targets
+        "runtimes-test-depends:runtimes-test-depends-${name}"
+        "check-runtimes:check-runtimes-${name}")
       foreach(target_name IN LISTS SUB_CHECK_TARGETS)
         list(APPEND ${name}_test_targets "${target_name}:${target_name}-${name}")
-        list(APPEND test_targets ${target_name}-${name})
+        list(APPEND test_targets "${target_name}-${name}")
       endforeach()
       set(test_targets "${test_targets}" PARENT_SCOPE)
     endif()