diff --git a/CMakeLists.txt b/CMakeLists.txt
index a501717ed..b630f7e46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,9 @@ elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
     include(Compiler-IntelLLVM)
     set(Fortran_COMPILER_VERSION_MIN 19)
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
+    include(Compiler-LLVMFlang)
+    set(Fortran_COMPILER_VERSION_MIN 19)
 else()
     message(FATAL_ERROR "Compiler '${CMAKE_Fortran_COMPILER_ID}' not supported")
 endif()
diff --git a/cmake/Compiler-GNU.cmake b/cmake/Compiler-GNU.cmake
index a62875d05..ee58f8cc7 100644
--- a/cmake/Compiler-GNU.cmake
+++ b/cmake/Compiler-GNU.cmake
@@ -1,10 +1,6 @@
 ###################################################################################################
 # GNU Compiler
 ###################################################################################################
-if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
-  message (FATAL_ERROR "GCC Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
-endif ()
-
 if (OPENMP)
   set (OPENMP_FLAGS "-fopenmp")
 endif ()
diff --git a/cmake/Compiler-Intel.cmake b/cmake/Compiler-Intel.cmake
index 19e75a9fa..2182459ed 100644
--- a/cmake/Compiler-Intel.cmake
+++ b/cmake/Compiler-Intel.cmake
@@ -1,10 +1,6 @@
 ###################################################################################################
 # Intel Compiler
 ###################################################################################################
-if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 18.0)
-  message (FATAL_ERROR "Intel Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
-endif ()
-
 if (OPENMP)
   set (OPENMP_FLAGS "-qopenmp -parallel")
 endif ()
diff --git a/cmake/Compiler-IntelLLVM.cmake b/cmake/Compiler-IntelLLVM.cmake
index 76fc0386a..4cdd2588d 100644
--- a/cmake/Compiler-IntelLLVM.cmake
+++ b/cmake/Compiler-IntelLLVM.cmake
@@ -1,10 +1,6 @@
 ###################################################################################################
-# Intel Compiler
+# IntelLLVM Compiler
 ###################################################################################################
-if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 18.0)
-  message (FATAL_ERROR "Intel Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
-endif ()
-
 if (OPENMP)
   set (OPENMP_FLAGS "-fiopenmp")
 endif ()
diff --git a/cmake/Compiler-LLVMFlang.cmake b/cmake/Compiler-LLVMFlang.cmake
new file mode 100644
index 000000000..c6b0405bc
--- /dev/null
+++ b/cmake/Compiler-LLVMFlang.cmake
@@ -0,0 +1,12 @@
+###################################################################################################
+# LLVM Compiler
+###################################################################################################
+if (OPENMP)
+  set (OPENMP_FLAGS "-fopenmp")
+endif ()
+
+#------------------------------------------------------------------------------------------------
+# Fine tuning compilation options
+set (COMPILE_FLAGS "${COMPILE_FLAGS} -cpp")
+# preprocessor
+