Recognize Flang as a compiler and ask for resource dir

Author: mjklemm

openmp/CMakeLists.txt

@@ -85,6 +85,11 @@ else()
   set(CMAKE_CXX_EXTENSIONS NO)
 endif()
 
+# Enabling Fortran if it is needed
+if(${LIBOMP_FORTRAN_MODULES})
+  enable_language(Fortran)
+endif()
+
 # Check and set up common compiler flags.
 include(config-ix)
 include(HandleOpenMPOptions)
@@ -118,12 +123,27 @@ if(${OPENMP_STANDALONE_BUILD})
       OUTPUT_STRIP_TRAILING_WHITESPACE
       COMMAND ${CMAKE_CXX_COMPILER} --print-resource-dir
       RESULT_VARIABLE COMMAND_RETURN_CODE
-      OUTPUT_VARIABLE COMPILER_RESOURCE_DIR
+      OUTPUT_VARIABLE CXX_COMPILER_RESOURCE_DIR
     )
-    set(LIBOMP_HEADERS_INSTALL_PATH "${COMPILER_RESOURCE_DIR}/include")
+    set(LIBOMP_HEADERS_INSTALL_PATH "${CXX_COMPILER_RESOURCE_DIR}/include")
   else()
     set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}")
   endif()
+  message("MK: CMAKE_Fortran_COMPILER_ID=${CMAKE_Fortran_COMPILER_ID}")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
+    execute_process(
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      COMMAND ${CMAKE_Fortran_COMPILER} --print-resource-dir
+      RESULT_VARIABLE COMMAND_RETURN_CODE
+      OUTPUT_VARIABLE FORTRAN_COMPILER_RESOURCE_DIR
+    )
+    # TODO: This must not be hard-coded, but needs to come from Flang!
+    set(LIBOMP_MODULES_INSTALL_PATH "${FORTRAN_COMPILER_RESOURCE_DIR}")
+    message("MK: 1 LIBOMP_MODULES_INSTALL_PATH=${LIBOMP_MODULES_INSTALL_PATH}")
+  else()
+    set(LIBOMP_MODULES_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}")
+    message("MK: 2 LIBOMP_MODULES_INSTALL_PATH=${CMAKE_INSTALL_INCLUDEDIR}")
+  endif()
 else()
   include(GetClangResourceDir)
   get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)

openmp/runtime/CMakeLists.txt

@@ -259,10 +259,6 @@ set(LIBOMP_TOOLS_DIR ${LIBOMP_BASE_DIR}/tools)
 set(LIBOMP_INC_DIR ${LIBOMP_SRC_DIR}/include)
 set(LIBOMP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-# Enabling Fortran if it is needed
-if(${LIBOMP_FORTRAN_MODULES})
-  enable_language(Fortran)
-endif()
 # Enable MASM Compiler if it is needed (Windows only)
 if(WIN32)
   enable_language(ASM_MASM)