Replace LIBOMP_FORTRAN_MODULES with RUNTIMES_FLANG_MODULES_ENABLED

For some reason there were to different flags to build the Fortran modules:

1. LIBOMP_FORTRAN_MODULES=ON and CMAKE_Fortran_COMPILER

2. LIBOMP_FORTRAN_MODULES_COMPILER

When using the second, LIBOMP_FORTRAN_MODULES would be off. Trying to
keep the option available causes build failures by misinterpretation.

Author: Meinersbur

openmp/CMakeLists.txt

@@ -124,11 +124,8 @@ endif ()
 set(OPENMP_TEST_Fortran_COMPILER "${OPENMP_TEST_Fortran_COMPILER_default}" CACHE STRING
   "Fortran compiler to use for testing OpenMP runtime libraries.")
 
-if (LLVM_RUNTIMES_BUILD)
-  set(LIBOMP_FORTRAN_MODULES "${RUNTIMES_FLANG_MODULES_ENABLED}" CACHE BOOL
-    "Create Fortran module files? (requires fortran compiler)")
-else ()
-  set(LIBOMP_FORTRAN_MODULES FALSE)
+if (CMAKE_Fortran_COMPILER AND NOT LLVM_RUNTIMES_BUILD)
+  message(WARNING "Building omp_lib.mod requires using LLVM_ENABLE_RUNTIMES=flang-rt\\\;openmp")
 endif ()
 
 # Set up testing infrastructure.
@@ -163,10 +160,10 @@ else()
   get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
 endif()
 
-if(LIBOMP_FORTRAN_MODULES)
+if(LIBOMP_FORTRUNTIMES_FLANG_MODULES_ENABLEDRAN_MODULES)
   add_subdirectory(module)
 else()
-  message(STATUS "Building omp_lib.mod disabled by LIBOMP_FORTRAN_MODULES='${LIBOMP_FORTRAN_MODULES}'; libomp-mod does nothing")
+  message(STATUS "Building omp_lib.mod disabled by RUNTIMES_FLANG_MODULES_ENABLED='${RUNTIMES_FLANG_MODULES_ENABLED}'; libomp-mod does nothing")
   add_custom_target(libomp-mod)
 endif()
 

openmp/README.rst

@@ -96,7 +96,7 @@ variable.
 
 **CMAKE_Fortran_COMPILER** = <Fortran compiler name>
   Specify the Fortran compiler. This option is only needed when
-  **LIBOMP_FORTRAN_MODULES** is ``ON`` (see below).  So typically, a Fortran
+  **RUNTIMES_FLANG_MODULES_ENABLED** is ``ON``.  So typically, a Fortran
   compiler is not needed during the build.
 
 **CMAKE_ASM_MASM_COMPILER** = ``ml|ml64``
@@ -166,9 +166,6 @@ Options for ``libomp``
 
     Static libraries are not supported on Windows*.
 
-**LIBOMP_FORTRAN_MODULES** = ``OFF|ON``
-  Create the Fortran modules (requires Fortran compiler).
-
 macOS* Fat Libraries
 """"""""""""""""""""
 On macOS* machines, it is possible to build universal (or fat) libraries which
@@ -343,7 +340,7 @@ Advanced Builds with Various Options
 
   .. code-block:: console
 
-    $ cmake -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc -DCMAKE_Fortran_COMPILER=ifort -DLIBOMP_FORTRAN_MODULES=on ..
+    $ cmake -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc -DCMAKE_Fortran_COMPILER=ifort -DRUNTIMES_FLANG_MODULES_ENABLED=on ..
 
 - Have CMake find the C/C++ compiler and specify additional flags for the
   preprocessor and C++ compiler.

openmp/module/CMakeLists.txt

@@ -21,9 +21,12 @@ add_library(libomp-mod OBJECT
 )
 set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Fortran Modules")
 
+# The following requests explicit building of the Fortran module files
+# Workaround for gfortran to build modules with the
+# omp_sched_monotonic integer parameter
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
- target_compile_options(libomp-mod PRIVATE -fno-range-check)
-endif()
+  target_compile_options(libomp-mod PRIVATE -fno-range-check)
+endif ()
 
 flang_module_target(libomp-mod PUBLIC)
 if (FORTRAN_MODULE_DEPS)

openmp/runtime/CMakeLists.txt

@@ -422,7 +422,7 @@ if(${OPENMP_STANDALONE_BUILD})
   libomp_say("Build Type           -- ${CMAKE_BUILD_TYPE}")
   libomp_say("Library Kind         -- ${LIBOMP_LIBRARY_KIND}")
   libomp_say("Library Type         -- ${LIBOMP_LIB_TYPE}")
-  libomp_say("Fortran Modules      -- ${LIBOMP_FORTRAN_MODULES}")
+  libomp_say("Fortran Modules      -- ${RUNTIMES_FLANG_MODULES_ENABLED}")
   # will say development if all zeros
   if(${LIBOMP_VERSION_BUILD} STREQUAL 00000000)
     set(LIBOMP_BUILD Development)

openmp/runtime/cmake/LibompExports.cmake

@@ -64,7 +64,7 @@ if(${LIBOMP_OMPT_SUPPORT})
     COMMAND ${CMAKE_COMMAND} -E copy omp-tools.h ${LIBOMP_EXPORTS_CMN_DIR}
   )
 endif()
-if(${LIBOMP_FORTRAN_MODULES})
+if(RUNTIMES_FLANG_MODULES_ENABLED)
   # We cannot attach a POST_BUILD command to libomp-mod, so instead attach it
   # to omp and ensure that libomp-mod is built before by adding a dependency
   add_custom_command(TARGET omp POST_BUILD