msvc build fix

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -182,6 +182,8 @@ function (add_flangrt_library name)
     endif ()
     add_library(${name}.default ALIAS "${default_target}")
 
+
+
     # Provide a build target that builds any enabled library.
     # Not intended for target_link_libraries. Either use the ${name}.static,
     # ${name}.shared variants, or ${name}.default to let BUILD_SHARED_LIBS
@@ -192,6 +194,12 @@ function (add_flangrt_library name)
     endif ()
   endif ()
 
+  if (build_object)
+    add_library(${name}.compile ALIAS "${name_object}")
+  else ()
+    add_library(${name}.compile ALIAS "${default_target}")
+  endif ()
+
   foreach (tgtname IN LISTS libtargets)
     if (NOT WIN32)
       # Use same stem name for .a and .so. Common in UNIX environments.
@@ -284,8 +292,8 @@ function (add_flangrt_library name)
     # Disable libstdc++/libc++ assertions, even in an LLVM_ENABLE_ASSERTIONS
     # build, to avoid an unwanted dependency on libstdc++/libc++.so.
     if (FLANG_RT_SUPPORTS_UNDEFINE_FLAG)
-      target_compile_options(${tgtname} PUBLIC $<$<COMPILE_LANGUAGE:C,CXX>:-U_GLIBCXX_ASSERTIONS>)
-      target_compile_options(${tgtname} PUBLIC $<$<COMPILE_LANGUAGE:C,CXX>:-U_LIBCPP_ENABLE_ASSERTIONS>)
+      target_compile_options(${tgtname} PUBLIC "$<$<COMPILE_LANGUAGE:C,CXX>:-U_GLIBCXX_ASSERTIONS>")
+      target_compile_options(${tgtname} PUBLIC "$<$<COMPILE_LANGUAGE:C,CXX>:-U_LIBCPP_ENABLE_ASSERTIONS>")
     endif ()
 
     # Flang/Clang (including clang-cl) -compiled programs targeting the MSVC ABI

flang-rt/lib/runtime/CMakeLists.txt

@@ -318,6 +318,7 @@ if (NOT WIN32)
   add_flangrt_library(flang_rt.intrinsics OBJECT
     ${intrinsics_sources}
   )
+  flang_module_target(flang_rt.intrinsics)
 
   add_flangrt_library(flang_rt.runtime STATIC SHARED
     ${sources}
@@ -336,6 +337,8 @@ if (NOT WIN32)
       Fortran_BUILDING_INSTRINSIC_MODULES TRUE
   )
 
+
+
 # TODO: shared (or global)
   #target_compile_options(flang_rt.runtime.static PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}>")
 
@@ -346,13 +349,19 @@ if (NOT WIN32)
   get_target_property(default_target flang_rt.runtime.default ALIASED_TARGET)
   add_library(flang_rt.runtime.unittest ALIAS "${default_target}")
 
-  add_dependencies(flang-rt-mod flang_rt.intrinsics flang_rt.runtime)
+  # Delect the target that compiles the sources
+  get_target_property(compile_target flang_rt.runtime.compile ALIASED_TARGET)
+    flang_module_target(${compile_target})
+    add_dependencies(flang-rt-mod flang_rt.intrinsics ${compile_target})
+
+
+
 else()
   # Target for building all versions of the runtime
   add_custom_target(flang_rt.runtime)
   set_target_properties(flang_rt.runtime PROPERTIES FOLDER "Flang-RT/Meta")
 
-  function (add_win_flangrt_runtime libtype suffix msvc_lib)
+  function(add_win_flangrt_runtime libtype suffix msvc_lib)
     set(name "flang_rt.runtime.${suffix}")
 
     add_flangrt_library(${name}.intrinsics OBJECT
@@ -380,9 +389,9 @@ else()
 
 # "$<$<COMPILE_LANGUAGE:Fortran>:-Xflang>"
 #TODO: Better as -fintrinsic-modules-path, need added option
-    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
-    target_compile_options(${name}.intrinsics PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
-    target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path> $<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>)
+    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:-fintrinsic-modules-path=${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
+    target_compile_options(${name}.intrinsics PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:-fintrinsic-modules-path=${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
+    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:-fintrinsic-modules-path=${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>")
 
     if (msvc_lib)
       set_target_properties(${name}
@@ -394,12 +403,19 @@ else()
     # Setting an unique Fortran_MODULE_DIRECTORY is required for each variant to
     # write a different .mod file.
     # Except for one selected one (the first)
-    if (_has_main_intrinsics)
-        set_property(TARGET ${name} ${name}.intrinsics
-          PROPERTY Fortran_MODULE_DIRECTORY "module.${suffix}"
-        )
+    if (NOT _has_main_intrinsics)
+      flang_module_target(${name}.intrinsics)
+
+  get_target_property(compile_target ${name}.compile ALIASED_TARGET)
+    flang_module_target(${compile_target})
+    add_dependencies(flang-rt-mod ${name}.intrinsics ${compile_target})
+
+      #set_property(TARGET ${name} ${name}.intrinsics
+      #  PROPERTY Fortran_MODULE_DIRECTORY "module.${suffix}"
+      #)
+     set(_has_main_intrinsics "YES" PARENT_SCOPE)
    else ()
-        set(_has_main_intrinsics "YES" PARENT_SCOPE)
+        #set(_has_main_intrinsics "YES" PARENT_SCOPE)
    endif ()
 
 

openmp/runtime/src/CMakeLists.txt

@@ -10,8 +10,6 @@
 
 include(ExtendPath)
 
-
-
 # Configure omp.h, kmp_config.h and omp-tools.h if necessary
 configure_file(${LIBOMP_INC_DIR}/omp.h.var ${LIBOMP_HEADERS_INTDIR}/omp.h @ONLY)
 configure_file(${LIBOMP_INC_DIR}/ompx.h.var ${LIBOMP_HEADERS_INTDIR}/ompx.h @ONLY)

runtimes/CMakeLists.txt

@@ -508,5 +508,3 @@ if(CMAKE_EXPORT_COMPILE_COMMANDS AND NOT ("${LLVM_BINARY_DIR}" STREQUAL "${CMAKE
                      DEPENDS ${CMAKE_BINARY_DIR}/compile_commands.json)
   add_custom_target(merge_runtime_commands ALL DEPENDS ${LLVM_BINARY_DIR}/compile_commands.json)
 endif()
-
-