Remove unused compile flag.

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

diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake
index a235b8f..3417e4b 100644 (file)
--- a/tools/cmake/GCCFlags.cmake
+++ b/tools/cmake/GCCFlags.cmake
@@ -5,7 +5,7 @@
 ##
 ##   These flags do break some classical CMake tests, so you don't
 ##   want to do so before the very end of the configuration.
-## 
+##
 ##   Other compiler flags (C/C++ standard version) are tested and set
 ##   by the beginning of the configuration, directly in ~/CMakeList.txt
 
@@ -18,9 +18,6 @@ if(enable_compile_warnings)
   if(CMAKE_COMPILER_IS_GNUCC AND (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0")))
     set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness")
   endif()
-  if(CMAKE_C_COMPILER_ID MATCHES "Clang|GCC")
-    set(warnCFLAGS "${warnCFLAGS} -Wno-format-nonliteral")
-  endif()
   if(CMAKE_COMPILER_IS_GNUCC)
     set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes")
   endif()
@@ -36,9 +33,6 @@ if(enable_compile_warnings)
   if(CMAKE_COMPILER_IS_GNUCXX AND (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")))
     set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness")
   endif()
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GCC")
-    set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-format-nonliteral")
-  endif()
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(warnCXXFLAGS "${warnCXXFLAGS} -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes")
   endif()
@@ -49,7 +43,7 @@ if(enable_compile_warnings)
   endif()
 
   # the one specific to C but refused by C++
-  set(warnCFLAGS "${warnCFLAGS} -Wmissing-prototypes") 
+  set(warnCFLAGS "${warnCFLAGS} -Wmissing-prototypes")
 
   if(CMAKE_Fortran_COMPILER_ID MATCHES "GCC|PGI")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall")
@@ -85,10 +79,6 @@ 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)
@@ -130,12 +120,12 @@ if(enable_lto) # User wants LTO. Try if we can do that
   else()
     if(NOT enable_compile_optimizations)
       message(STATUS "LTO disabled: Compile-time optimizations turned off.")
-    else() 
+    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() 
+      endif()
     endif()
   endif()
 else()
@@ -178,6 +168,11 @@ if(enable_model-checking AND enable_compile_optimizations)
   endforeach()
 endif()
 
+if (CMAKE_C_COMPILER_ID MATCHES "Intel")
+  # honor parentheses when determining the order of expression evaluation.
+  set(optCFLAGS "${optCFLAGS} -fprotect-parens ")
+endif()
+
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
@@ -193,7 +188,7 @@ 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")  
+  set_source_files_properties(src/surf/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef")
 endif()
 
 set(TESH_OPTION "")
@@ -216,18 +211,21 @@ if(enable_address_sanitizer)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
     set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -fsanitize=address")
     set(TESH_OPTION --enable-sanitizers)
-    try_compile(HAVE_SANITIZE_ADDRESS ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp)
-    try_compile(HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp
+    try_compile(HAVE_SANITIZER_ADDRESS ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp)
+    try_compile(HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp
       COMPILE_DEFINITIONS -DCHECK_FIBER_SUPPORT)
 else()
-    set(HAVE_SANITIZE_ADDRESS FALSE CACHE INTERNAL "")
-    set(HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT FALSE CACHE INTERNAL "")
+    set(HAVE_SANITIZER_ADDRESS FALSE CACHE INTERNAL "")
+    set(HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT FALSE CACHE INTERNAL "")
 endif()
 
 if(enable_thread_sanitizer)
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -no-pie")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -no-pie")
     set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -fsanitize=thread -no-pie")
+    set(HAVE_SANITIZER_THREAD TRUE CACHE INTERNAL "")
+else()
+    set(HAVE_SANITIZER_THREAD FALSE CACHE INTERNAL "")
 endif()
 
 if(enable_undefined_sanitizer)
@@ -258,13 +256,13 @@ if(MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
   set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS   "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc")
   set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static-libgcc -static-libstdc++")
-  
+
   # JNI searches for stdcalls
   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wl,--add-stdcall-alias")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--add-stdcall-alias")
   set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -Wl,--add-stdcall-alias")
   set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -Wl,--add-stdcall-alias")
-  
+
   # Specify the data model that we are using (yeah it may help Java)
   if(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -m32")
@@ -272,5 +270,5 @@ if(MINGW)
   else()
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -m64")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-  endif()  
+  endif()
 endif()