X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f9cccb2d6ad2f63bfde3faa64aa641d0dbd6432..694a2b171a6e03d42d5068bc6ba6c353cb0e34e3:/tools/cmake/Flags.cmake

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 2fc6cc8edc..d101b92122 100644
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -19,17 +19,20 @@ if(enable_compile_warnings)
     set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness")
   endif()
   if(CMAKE_COMPILER_IS_GNUCC)
-    set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized")
+    set(warnCFLAGS "${warnCFLAGS} -Wsuggest-override -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized")
   endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    # ignore remark  #1418: external function definition with no prior declaration
+    # ignore remarks:
+    # 191: type qualifier is meaningless on cast type
+    # 1418: external function definition with no prior declaration
     # 2196: routine is both "inline" and "noinline"
+    # 2651: attribute does not apply to any entity
     # 3179: deprecated conversion of string literal to char* (should be const char*)
-    # 191: type qualifier is meaningless on cast type
+    # set as warning:
     # 597: entity-kind "entity" will not be called for implicit or explicit conversions
     # 2330: argument of type "type" is incompatible with parameter of type "type" (dropping qualifiers)
     # 11003: no IR in object file xxxx; was the source file compiled with xxxx
-    set(warnCFLAGS "${warnCFLAGS} -diag-disable=1418,191,2196,3179 -diag-warning=2330,597,11003")
+    set(warnCFLAGS "${warnCFLAGS} -diag-disable=191,1418,2196,2651,3179 -diag-warning=597,2330,11003")
   endif()
 
   set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")
@@ -100,9 +103,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
     set(RELATIVE_SOURCE_DIR ".")
   endif()
   if (CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0")
-    set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
+    set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"")
   else()
-    set(optCFLAGS "${optCFLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
+    set(optCFLAGS "${optCFLAGS} -ffile-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"")
   endif()
 endif()
 
@@ -119,11 +122,7 @@ if(enable_lto) # User wants LTO. Try if we can do that
       endif()
     else()
       include(CheckIPOSupported)
-      set(ipoLANGS C CXX)
-      if(SMPI_FORTRAN)
-        set(ipoLANGS ${ipoLANGS} Fortran)
-      endif()
-      check_ipo_supported(RESULT ipo LANGUAGES ${ipoLANGS})
+      check_ipo_supported(RESULT ipo LANGUAGES C CXX)
       if(ipo)
         set(enable_lto ON)
       endif()
@@ -152,6 +151,16 @@ if(enable_lto) # User wants LTO, and it seems usable. Go for it
     list(APPEND CMAKE_C_COMPILE_OPTIONS_IPO "-flto=${LTO_EXTRA_FLAG}")
     list(APPEND CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto=${LTO_EXTRA_FLAG}")
   endif()
+
+  # Activate fat-lto-objects in case LD and gfortran differ too much.
+  # Only test with GNU as it's the only case I know (clang+gfortran+lld)
+  execute_process(COMMAND ${CMAKE_LINKER} -v OUTPUT_VARIABLE LINKER_ID ERROR_VARIABLE LINKER_ID)
+  string(REGEX MATCH "GNU" LINKER_ID "${LINKER_ID}")
+  if(${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU"
+     AND NOT "${LINKER_ID}" MATCHES "GNU")
+       list(APPEND CMAKE_Fortran_COMPILE_OPTIONS_IPO "-ffat-lto-objects")
+  endif()
+
   # "Since version 4.9 gcc produces slim object files that only contain
   # the intermediate representation. In order to handle archives of
   # these objects you have to use the gcc wrappers:
@@ -165,15 +174,15 @@ endif()
 
 if(enable_model-checking AND enable_compile_optimizations)
   # Forget it, do not optimize the code (because it confuses the MC):
-  set(optCFLAGS "-O0 ")
+  set(optCFLAGS "-O0")
   # But you can still optimize this:
   foreach(s
       src/simix/popping.cpp src/simix/popping_generated.cpp src/simix/smx_global.cpp
       ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC}
       ${MC_SRC_BASE} ${MC_SRC})
-      set (mcCFLAGS "-O3  -funroll-loops -fno-strict-aliasing")
-       if(CMAKE_COMPILER_IS_GNUCC)
-         set (mcCFLAGS "${mcCFLAGS} -finline-functions")
+      set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
+      if(CMAKE_COMPILER_IS_GNUCC)
+        set (mcCFLAGS "${mcCFLAGS} -finline-functions")
       endif()
       set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
   endforeach()
@@ -192,7 +201,7 @@ endif()
 set(CMAKE_C_FLAGS   "${warnCFLAGS} ${CMAKE_C_FLAGS}   ${optCFLAGS}")
 set(CMAKE_CXX_FLAGS "${warnCXXFLAGS} ${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
-# Try to make Mac a bit more complient to open source standards
+# Try to make Mac a bit more compliant to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
@@ -204,7 +213,7 @@ endif()
 
 set(TESH_OPTION "")
 if(enable_coverage)
-  find_program(GCOV_PATH gcov)
+  find_program(GCOV_PATH NAMES ENV{GCOV} gcov)
   if(GCOV_PATH)
     set(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOVERAGE")