There is too much boost include to protect, disable -Wundef on FreeBSD alltogether

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

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index a8d0e65..e7ba000 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -1,7 +1,7 @@
 ##
 ## This file is in charge of setting our paranoid flags with regard to warnings and optimization.
 ##
-##   It is only used for gcc and clang. MSVC builds don't load this file.
+##   It is only used for gcc, clang and Intel compilers.
 ##
 ##   These flags do break some classical CMake tests, so you don't
 ##   want to do so before the very end of the configuration.
@@ -14,7 +14,7 @@ set(optCFLAGS "")
 set(warnCXXFLAGS "")
 
 if(enable_compile_warnings)
-  set(warnCFLAGS "-fno-common -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")
+  set(warnCFLAGS "-fno-common -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-strict-aliasing")
 
   if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     # ignore remarks:
@@ -32,7 +32,7 @@ if(enable_compile_warnings)
   set(warnCXXFLAGS "${warnCFLAGS}")
 
   if(CMAKE_COMPILER_IS_GNUCC)
-    set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized")
+    set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-error=attributes -Wno-error=maybe-uninitialized")
   endif()
 
   if(CMAKE_COMPILER_IS_GNUCXX)
@@ -77,13 +77,12 @@ if(enable_compile_warnings AND enable_debug)
 endif()
 
 # Activate the warnings on #if FOOBAR when FOOBAR has no value
-# It breaks on FreeBSD within Boost headers, so activate this only in Pure Hardcore debug mode.
-if(enable_maintainer_mode)
+if("${CMAKE_SYSTEM}" MATCHES "Linux") # Breaks on FreeBSD within Boost headers :(
   set(warnCFLAGS "${warnCFLAGS} -Wundef")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wundef")
 endif()
 
-# Se the optimisation flags
+# Set the optimisation flags
 # NOTE, we should CMAKE_BUILD_TYPE for this
 if(enable_compile_optimizations)
   set(optCFLAGS "-O3 -funroll-loops -fno-strict-aliasing ")
@@ -91,13 +90,12 @@ else()
   set(optCFLAGS "-O0 ")
 endif()
 
-#ARM platforms have signed char by default, switch to unsigned for consistancy
+# ARM platforms have signed char by default, switch to unsigned for consistancy
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
   set(optCFLAGS "${optCFLAGS} -fsigned-char")
 endif()
 
-if(enable_compile_optimizations AND CMAKE_COMPILER_IS_GNUCC
-    AND (NOT enable_model-checking))
+if(enable_compile_optimizations AND CMAKE_COMPILER_IS_GNUCC)
   # This is redundant (already in -03):
   set(optCFLAGS "${optCFLAGS} -finline-functions ")
 endif()
@@ -120,20 +118,11 @@ endif()
 # Configure LTO
 if(enable_lto) # User wants LTO. Try if we can do that
   set(enable_lto OFF)
-  if(enable_compile_optimizations
-      AND (NOT enable_model-checking))
-    if(CMAKE_VERSION VERSION_LESS "3.9")
-      if ( CMAKE_COMPILER_IS_GNUCC
-         AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.8.5")
-         AND (LINKER_VERSION VERSION_GREATER "2.22"))
-        set(enable_lto ON)
-      endif()
-    else()
-      include(CheckIPOSupported)
-      check_ipo_supported(RESULT ipo LANGUAGES C CXX)
-      if(ipo)
-        set(enable_lto ON)
-      endif()
+  if(enable_compile_optimizations)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT ipo LANGUAGES C CXX)
+    if(ipo)
+      set(enable_lto ON)
     endif()
   endif()
 
@@ -143,11 +132,7 @@ if(enable_lto) # User wants LTO. Try if we can do that
     if(NOT enable_compile_optimizations)
       message(STATUS "LTO disabled: Compile-time optimizations turned off.")
     else()
-      if(enable_model-checking)
-        message(STATUS "LTO disabled when compiling with model-checking.")
-      else()
-        message(STATUS "LTO does not seem usable -- try updating your build chain.")
-      endif()
+      message(STATUS "LTO does not seem usable -- try updating your build chain.")
     endif()
   endif()
 else()
@@ -180,25 +165,6 @@ if(enable_lto) # User wants LTO, and it seems usable. Go for it
   endif()
 endif()
 
-if(enable_model-checking AND enable_compile_optimizations)
-  # Forget it, do not optimize the code (because it confuses the MC):
-  set(optCFLAGS "-O0")
-  # But you can still optimize this:
-  set(src_list ${simgrid_sources})
-  # except...
-  list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC})
-  # but...
-  list(APPEND src_list
-    src/kernel/actor/Simcall.cpp)
-  foreach(src ${src_list})
-      set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
-      if(CMAKE_COMPILER_IS_GNUCC)
-        set (mcCFLAGS "${mcCFLAGS} -finline-functions")
-      endif()
-      set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
-  endforeach()
-endif()
-
 if (CMAKE_C_COMPILER_ID MATCHES "Intel")
   # honor parentheses when determining the order of expression evaluation.
   # disallow optimizations for floating-point arithmetic with Nans or +-Infs (breaks Eigen3)
@@ -218,11 +184,6 @@ 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/kernel/resource/models/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef")
-endif()
-
 set(TESH_OPTION "")
 if(enable_coverage)
   find_program(GCOV_PATH NAMES ENV{GCOV} gcov)