Merge branch 'xbt_random' into 'master'

[simgrid.git] / tools / cmake / Flags.cmake

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 99f5976..e752365 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -49,8 +49,11 @@ if(enable_compile_warnings)
 
   if(CMAKE_Fortran_COMPILER_ID MATCHES "GCC|PGI")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall")
-  endif()
-  if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
+    # flang >= 7 has a bug with common and debug flags. Ignore cmake-added -g in this case.
+    # https://github.com/flang-compiler/flang/issues/671
+    set(CMAKE_Fortran_FLAGS "-Wall")
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn all")
   endif()
   set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
@@ -60,6 +63,9 @@ endif()
 if(enable_compile_warnings AND enable_debug)
   set(warnCFLAGS "${warnCFLAGS} -Werror")
   set(warnCXXFLAGS "${warnCXXFLAGS} -Werror")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "GCC")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Werror -Werror=format-security")
+  endif()
 endif()
 
 # Activate the warnings on #if FOOBAR when FOOBAR has no value