CufRuntime only supports static library

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -138,6 +138,21 @@ function (add_flangrt_library name)
     add_library("${name_shared}" SHARED ${extra_args} ${ARG_ADDITIONAL_HEADERS} ${ARG_UNPARSED_ARGUMENTS})
   endif ()
 
+  # Provide a default target if building both and which exists in either setting.
+  if (BUILD_SHARED_LIBS)
+    if (build_shared)
+      add_library(${name}.default ALIAS ${name_shared})
+    else ()
+      add_library(${name}.default ALIAS ${name})
+    endif ()
+  else ()
+    if (build_static)
+      add_library(${name}.default ALIAS ${name_static})
+    else ()
+      add_library(${name}.default ALIAS ${name})
+    endif ()
+  endif ()
+
   foreach (tgtname IN LISTS libtargets)
     if (NOT WIN32)
       # Use same stem name for .a and .so. Common in UNIX environments.

flang-rt/cmake/modules/AddFlangRTOffload.cmake

@@ -8,9 +8,9 @@
 
 macro(enable_cuda_compilation name files)
   if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
-    if (FLANG_RT_ENABLE_SHARED)
+    if (NOT FLANG_RT_ENABLE_STATIC)
       message(FATAL_ERROR
-        "FLANG_RT_ENABLE_SHARED is not supported for CUDA build of Flang-RT"
+        "FLANG_RT_ENABLE_STATIC is required for CUDA build of Flang-RT"
         )
     endif()
 

flang-rt/lib/flang_rt/CUDA/CMakeLists.txt

@@ -6,12 +6,8 @@
 #
 #===------------------------------------------------------------------------===#
 
-# libCufRuntime depends on a certain version of CUDA. To be able to have
-# multiple build of this library with different CUDA version, the version is
-# added to the library name.
-set(CUFRT_LIBNAME CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR})
 
-add_flangrt_library(${CUFRT_LIBNAME}
+add_flangrt_library(CufRuntime STATIC
   allocatable.cpp
   allocator.cpp
   descriptor.cpp
@@ -20,21 +16,19 @@ add_flangrt_library(${CUFRT_LIBNAME}
   memory.cpp
   registration.cpp
 )
-target_include_directories(${CUFRT_LIBNAME} PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
 
-if (BUILD_SHARED_LIBS)
-  set(CUDA_RT_TARGET CUDA::cudart)
-else()
-  set(CUDA_RT_TARGET CUDA::cudart_static)
-endif()
-
-target_link_libraries(${CUFRT_LIBNAME}
-  PRIVATE
-  flang_rt
-  ${CUDA_RT_TARGET}
+# libCufRuntime depends on a certain version of CUDA. To be able to have
+# multiple build of this library with different CUDA version, the version is
+# added to the library name.
+set_target_properties(CufRuntime
+  PROPERTIES
+    OUTPUT_NAME "CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}"
 )
 
-# Phony build target that does not include the CUDA version.
-add_custom_target(CufRuntime)
-add_dependencies(CufRuntime ${CUFRT_LIBNAME})
+target_include_directories(CufRuntime PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
 
+target_link_libraries(CufRuntime
+  PUBLIC
+  flang_rt
+  CUDA::cudart_static
+)

flang-rt/unittests/Runtime/CUDA/CMakeLists.txt

@@ -12,17 +12,7 @@ add_flangrt_unittest(FlangCufRuntimeTests
   Memory.cpp
 )
 
-if (BUILD_SHARED_LIBS)
-  set(CUDA_RT_TARGET CUDA::cudart)
-else()
-  set(CUDA_RT_TARGET CUDA::cudart_static)
-endif()
-
 target_link_libraries(FlangCufRuntimeTests
   PRIVATE
-  ${CUDA_RT_TARGET}
-  CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}
-  flang_rt.unittest
+  CufRuntime
 )
-
-target_include_directories(FlangCufRuntimeTests PRIVATE ${CUDAToolkit_INCLUDE_DIRS})