Modern CMake

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -225,13 +225,28 @@ function (add_flangrt_library name)
     # Minimum required C++ version for Flang-RT, even if CMAKE_CXX_STANDARD is defined to something else.
     target_compile_features(${tgtname} PRIVATE cxx_std_17)
 
+    target_compile_options(${tgtname} PRIVATE
+      # Always enable preprocessor regardless of file extention
+      "$<$<COMPILE_LANGUAGE:Fortran>:-cpp>"
+
+      # Missing type descriptors are expected for intrinsic modules 
+      "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-mmlir;SHELL:-ignore-missing-type-desc>"
+
+      # Flang bug workaround: Reformating of cooked token buffer causes identifier to be split between lines
+      "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-Xflang;SHELL:-fno-reformat>"
+    )
+
     # When building the flang runtime if LTO is enabled the archive file
     # contains LLVM IR rather than object code. Currently flang is not
     # LTO aware so cannot link this file to compiled Fortran code.
     if (FLANG_RT_HAS_FNO_LTO_FLAG)
       target_compile_options(${tgtname} PRIVATE -fno-lto)
     endif ()
 
+    if (FORTRAN_SUPPORTS_REAL16)
+      target_compile_definitions(${tgtname} PRIVATE FLANG_SUPPORT_R16=1)
+    endif ()
+
     # Use compiler-specific options to disable exceptions and RTTI.
     if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
       target_compile_options(${tgtname} PRIVATE

flang-rt/lib/runtime/CMakeLists.txt

@@ -113,20 +113,22 @@ if (LLVM_TARGET_TRIPLE MATCHES "^ppc|^powerpc")
   )
 endif ()
 
-list(APPEND host_sources
-  __cuda_device.f90
-  cooperative_groups.f90
-  cudadevice.f90
-)
-
-# Compile as CUDA-Fortran, not directly supported by CMake
-set_property(SOURCE
+if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
+  list(APPEND host_sources
     __cuda_device.f90
     cooperative_groups.f90
     cudadevice.f90
-  APPEND PROPERTY
-    COMPILE_OPTIONS --offload-host-only -xcuda
-)
+  )
+
+  # Compile as CUDA-Fortran, not directly supported by CMake
+  set_property(SOURCE
+      __cuda_device.f90
+      cooperative_groups.f90
+      cudadevice.f90
+    APPEND PROPERTY
+      COMPILE_OPTIONS --offload-host-only -xcuda
+  )
+endif ()
 
 # Sources that can be compiled directly for the GPU.
 set(gpu_sources
@@ -215,26 +217,11 @@ endif ()
 
 if (LLVM_RUNTIMES_TARGET MATCHES "^amdgcn|^nvptx")
   set(sources ${gpu_sources})
-elseif(FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
-  set(sources ${supported_sources} ${host_sources})
 else ()
   set(sources ${supported_sources} ${host_sources} ${f128_sources})
 endif ()
 
 
-if (FORTRAN_SUPPORTS_REAL16)
-  add_compile_definitions(FLANG_SUPPORT_R16=1)
-  add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-cpp>")
-endif ()
-
-add_compile_options(
-  "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-mmlir;SHELL:-ignore-missing-type-desc>"
-
-  # Flang bug workaround: Reformating of cooked token buffer causes identifier to be split between lines
-  "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-Xflang;SHELL:-fno-reformat>"
-)
-
-
 # check-flang depends on this to build intrinsic modules
 if (NOT TARGET flang-rt-mod)
   add_custom_target(flang-rt-mod)