Fix default targets ALIAS

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -146,17 +146,21 @@ function (add_flangrt_library name)
   if (libtargets)
     if (BUILD_SHARED_LIBS)
       if (build_shared)
-        add_library(${name}.default ALIAS ${name_shared})
+        set(default_target "${name_shared}")
       else ()
-        add_library(${name}.default ALIAS ${name_static})
+        set(default_target "${name_static}")
       endif ()
     else ()
       if (build_static)
-        add_library(${name}.default ALIAS ${name_static})
+        set(default_target "${name_static}")
       else ()
-        add_library(${name}.default ALIAS ${name_shared})
+        set(default_target "${name_shared}")
       endif ()
     endif ()
+    add_library(${name}.default ALIAS "${default_target}")
+    if (NOT TARGET ${name})
+      add_library(${name} ALIAS "${default_target}")
+    endif ()
   endif ()
 
   foreach (tgtname IN LISTS libtargets)

flang-rt/cmake/modules/AddFlangRTOffload.cmake

@@ -8,15 +8,15 @@
 
 macro(enable_cuda_compilation name files)
   if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
-    if (NOT FLANG_RT_ENABLE_STATIC)
+    if (FLANG_RT_ENABLE_SHARED)
       message(FATAL_ERROR
-        "FLANG_RT_ENABLE_STATIC is required for CUDA build of Flang-RT"
+        "FLANG_RT_ENABLE_SHARED is not supported for CUDA offload build of Flang-RT"
         )
     endif()
 
     enable_language(CUDA)
 
-    set_target_properties(${name}
+    set_target_properties(${name}.static
         PROPERTIES
           CUDA_SEPARABLE_COMPILATION ON
       )
@@ -61,7 +61,7 @@ macro(enable_cuda_compilation name files)
     # When using libcudacxx headers files, we have to use them
     # for all files of Flang-RT.
     if (EXISTS "${FLANG_RT_LIBCUDACXX_PATH}/include")
-      foreach (tgt IN ITEMS "${name}" "obj.${name}PTX")
+      foreach (tgt IN ITEMS "${name}.static" "obj.${name}PTX")
         target_include_directories(${tgt} AFTER PRIVATE "${FLANG_RT_LIBCUDACXX_PATH}/include")
         target_compile_definitions(${tgt} PRIVATE RT_USE_LIBCUDACXX=1)
       endforeach ()

flang-rt/lib/flang_rt/CMakeLists.txt

@@ -139,7 +139,6 @@ if (NOT WIN32)
 
   # Select a default runtime, which is used for unit and regression tests.
   get_target_property(default_target flang_rt.default ALIASED_TARGET)
-  add_library(flang_rt ALIAS "${default_target}")
   add_library(flang_rt.unittest ALIAS "${default_target}")
 else()
   # Target for building all versions of the runtime