X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bd1bbd35034c2e93a030a676dc244ad2cf74c70..8d00a11d518c329ff699505e9b98444abc485bbb:/tools/cmake/GCCFlags.cmake

diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake
index 94aaffda7f..d9ae691b0f 100644
--- a/tools/cmake/GCCFlags.cmake
+++ b/tools/cmake/GCCFlags.cmake
@@ -24,6 +24,12 @@ if(enable_compile_warnings)
   if(CMAKE_COMPILER_IS_GNUCC)
     set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes")
   endif()
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    # ignore remark  #1418: external function definition with no prior declaration
+    # 3179: deprecated conversion of string literal to char* (should be const char*)
+    # 191: type qualifier is meaningless on cast type
+    set(warnCFLAGS "${warnCFLAGS} -wd1418 -wd191 -wd3179")
+  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")
   if(CMAKE_COMPILER_IS_GNUCXX AND (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")))
@@ -78,10 +84,22 @@ if(enable_compile_optimizations AND CMAKE_COMPILER_IS_GNUCC
   # This is redundant (already in -03):
   set(optCFLAGS "${optCFLAGS} -finline-functions ")
 endif()
+if (CMAKE_C_COMPILER_ID MATCHES "Intel")
+  # honor parentheses when determining the order of expression evaluation.
+  set(optCFLAGS "${optCFLAGS} -fprotect-parens ")
+endif()
 
 # Do not leak the current directory into the binaries
 if(CMAKE_COMPILER_IS_GNUCC)
-  set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=.")
+  execute_process(COMMAND realpath --relative-to=${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT OUTPUT_VARIABLE RELATIVE_SOURCE_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(RESULT EQUAL 0)
+    message(STATUS "Relative source directory is \"${RELATIVE_SOURCE_DIR}\".")
+  else()
+    message(WARNING "Failed to find relative source directory. Using \".\".")
+    set(RELATIVE_SOURCE_DIR ".")
+  endif()
+  set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
 endif()
 
 # Configure LTO
@@ -107,20 +125,20 @@ if(enable_lto) # User wants LTO. Try if we can do that
     endif()
   endif()
   if(enable_lto)
-    message("-- LTO seems usable.")
+    message(STATUS "LTO seems usable.")
   else()
     if(NOT enable_compile_optimizations)
-      message("-- LTO disabled: Compile-time optimizations turned off.")
+      message(STATUS "LTO disabled: Compile-time optimizations turned off.")
     else() 
       if(enable_model-checking)
-        message("-- LTO disabled when compiling with model-checking.")
+        message(STATUS "LTO disabled when compiling with model-checking.")
       else()
-        message("-- LTO does not seem usable -- try updating your build chain.")
+        message(STATUS "LTO does not seem usable -- try updating your build chain.")
       endif() 
     endif()
   endif()
 else()
-  message("-- LTO disabled on the command line.")
+  message(STATUS "LTO disabled on the command line.")
 endif()
 if(enable_lto) # User wants LTO, and it seems usable. Go for it
   set(optCFLAGS "${optCFLAGS} -flto ")
@@ -141,11 +159,12 @@ if(enable_model-checking AND enable_compile_optimizations)
   set(optCFLAGS "-O0 ")
   # But you can still optimize this:
   foreach(s
+      src/kernel/lmm/fair_bottleneck.cpp src/kernel/lmm/lagrange.cpp src/kernel/lmm/maxmin.cpp
       src/xbt/mmalloc/mm.c
       src/xbt/log.c src/xbt/xbt_log_appender_file.c
       src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c
       src/xbt/dict.cpp src/xbt/dict_elm.c src/xbt/dict_cursor.c
-      src/xbt/dynar.cpp src/xbt/swag.c
+      src/xbt/dynar.cpp
       src/xbt/xbt_str.cpp src/xbt/snprintf.c
       src/xbt/xbt_os_time.c src/xbt/xbt_os_thread.c
       src/xbt/backtrace_linux.cpp
@@ -171,6 +190,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
 
+# Avoid a failure seen with gcc 7.2.0 and ns3 3.27
+if(enable_ns3)
+  set_source_files_properties(src/surf/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef")  
+endif()
+
 set(TESH_OPTION "")
 if(enable_coverage)
   find_program(GCOV_PATH gcov)