Properties to apply to all targets of a library

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -27,10 +27,14 @@
 #     Library requires include path and linking to LLVM's Support component
 #   ADDITIONAL_HEADERS
 #     May specify header files for IDE generators.
+#   INCLUDE_DIRECTORIES
+#     Additional include_directories for all added targets
+#   TARGET_PROPERTIES
+#     Set target properties of all added targets
 # )
 function (add_flangrt_library name)
   set(options STATIC SHARED OBJECT INSTALL_WITH_TOOLCHAIN EXCLUDE_FROM_ALL LINK_TO_LLVM)
-  set(multiValueArgs ADDITIONAL_HEADERS)
+  set(multiValueArgs ADDITIONAL_HEADERS INCLUDE_DIRECTORIES TARGET_PROPERTIES)
   cmake_parse_arguments(ARG
     "${options}"
     ""
@@ -152,6 +156,10 @@ function (add_flangrt_library name)
     target_include_directories(${name} PUBLIC ${LLVM_INCLUDE_DIRS})
   endif ()
 
+  if (ARG_INCLUDE_DIRECTORIES)
+    target_include_directories(${name} ${ARG_INCLUDE_DIRECTORIES})
+  endif ()
+
   # If this is part of the toolchain, put it into the compiler's resource
   # directory. Otherwise it is part of testing and is not installed at all.
   # TODO: Consider multi-configuration builds (MSVC_IDE, "Ninja Multi-Config")
@@ -166,6 +174,10 @@ function (add_flangrt_library name)
       )
   endif ()
 
+  if (ARG_TARGET_PROPERTIES)
+    set_target_properties(${name} PROPERTIES ${ARG_TARGET_PROPERTIES})
+  endif ()
+
   # flang-rt should build all the Flang-RT targets that are built in an
   # 'all' build.
   if (NOT ARG_EXCLUDE_FROM_ALL)

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

@@ -15,17 +15,16 @@ add_flangrt_library(CufRuntime STATIC
   memmove-function.cpp
   memory.cpp
   registration.cpp
-)
 
-# 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
+  # 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.
+  TARGET_PROPERTIES
     OUTPUT_NAME "CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}"
-)
 
-target_include_directories(CufRuntime PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES
+    PRIVATE ${CUDAToolkit_INCLUDE_DIRS}
+)
 
 target_link_libraries(CufRuntime
   PUBLIC

flang/include/flang/Runtime/descriptor-consts.h

@@ -11,6 +11,7 @@
 
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Common/api-attrs.h"
+#include "flang/Common/Fortran-consts.h"
 #include <cstddef>
 #include <cstdint>
 
@@ -29,6 +30,7 @@ class DerivedType;
 namespace Fortran::runtime {
 class Descriptor;
 using SubscriptValue = ISO::CFI_index_t;
+using common::TypeCategory;
 
 /// Returns size in bytes of the descriptor (not the data)
 /// This must be at least as large as the largest descriptor of any target