X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1623a362b20f59ab27938f3f073f43ef7404deb..77c0face3a66d71cb73f4c5444d0c45bf3bb6aa1:/tools/cmake/Flags.cmake

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 740e7f5d8c..3e92f6061a 100644
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -28,7 +28,8 @@ if(enable_compile_warnings)
     # 191: type qualifier is meaningless on cast type
     # 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)
-    set(warnCFLAGS "${warnCFLAGS} -wd1418 -wd191 -wd2196 -wd3179 -ww597 -ww2330")
+    # 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")
   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")
@@ -99,9 +100,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()
 
@@ -118,7 +119,7 @@ if(enable_lto) # User wants LTO. Try if we can do that
       endif()
     else()
       include(CheckIPOSupported)
-      check_ipo_supported(RESULT ipo)
+      check_ipo_supported(RESULT ipo LANGUAGES C CXX)
       if(ipo)
         set(enable_lto ON)
       endif()
@@ -143,6 +144,20 @@ else()
 endif()
 if(enable_lto) # User wants LTO, and it seems usable. Go for it
   set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+  if(LTO_EXTRA_FLAG AND CMAKE_COMPILER_IS_GNUCC)
+    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:
@@ -183,7 +198,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()
@@ -195,7 +210,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")