runtimes build fix

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -329,10 +329,11 @@ function (add_flangrt_library name)
     endif ()
   endforeach ()
 
+  message("${name} RUNTIMES_OUTPUT_RESOURCE_MOD_DIR: ${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}")
   foreach (tgtname IN LISTS srctargets)
       set_target_properties(${tgtname}
         PROPERTIES
-          Fortran_MODULE_DIRECTORY "${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}"
+          Fortran_MODULE_DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}"
         )
 
       target_compile_options(${tgtname} PRIVATE ${ARG_COMPILE_OPTIONS})

openmp/runtime/src/CMakeLists.txt

@@ -471,7 +471,7 @@ endif ()
     omp_lib.F90
   )
   flang_module_target(libomp-mod)
-   add_dependencies(libomp-mod flang-rt-mod)
+  add_dependencies(libomp-mod flang-rt-mod)
 
   libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
   target_compile_options(libomp-mod PRIVATE ${LIBOMP_CONFIGURED_FFLAGS})

runtimes/CMakeLists.txt

@@ -61,11 +61,6 @@ function(runtime_register_component name)
   set_property(GLOBAL APPEND PROPERTY SUB_COMPONENTS ${name})
 endfunction()
 
-
-
-
-
-
 find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_package(Clang PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 
@@ -356,7 +351,7 @@ macro(flang_module_fortran_enable)
       # For the install prefix, still use the resource dir assuming that Flang will
       # be installed there using the same prefix. This is to not have a difference
       # between bootstrap and standalone runtimes builds.
-      set(RUNTIMES_OUTPUT_RESOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+      set(RUNTIMES_OUTPUT_RESOURCE_DIR "${CMAKE_BINARY_DIR}")
       set(RUNTIMES_INSTALL_RESOURCE_PATH_DEFAULT "lib${LLVM_LIBDIR_SUFFIX}/clang/${LLVM_VERSION_MAJOR}")
 
       extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${RUNTIMES_OUTPUT_RESOURCE_DIR}" "finclude")
@@ -366,7 +361,7 @@ macro(flang_module_fortran_enable)
     if (LLVM_TREE_AVAILABLE)
       set(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}/../finclude-${CMAKE_Fortran_COMPILER_ID}")
     else ()
-      set(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${CMAKE_CURRENT_BINARY_DIR}/finclude-${CMAKE_Fortran_COMPILER_ID}")
+      set(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${CMAKE_BINARY_DIR}/finclude-${CMAKE_Fortran_COMPILER_ID}")
     endif ()
     set(RUNTIMES_INSTALL_RESOURCE_MOD_PATH "finclude-${CMAKE_Fortran_COMPILER_ID}")
   endif ()