X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37151c0d4c6efccef4ac99502864f1a7d8fc830b..d601dbd71dbcb5b7e879a30bddfe963dc91082ed:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 3fab3f3cb4..28a0cb4014 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -4,41 +4,46 @@ set(optCFLAGS "")
 if(NOT __VISUALC__ AND NOT __BORLANDC__)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
-else(NOT __VISUALC__ AND NOT __BORLANDC__)
+else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
-endif(NOT __VISUALC__ AND NOT __BORLANDC__)
+endif()
 
 if(enable_compile_warnings)
-  set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
+  set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror -Wno-error=clobbered ")
   if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
     set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
-  else(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-    set(warnCFLAGS "${warnCFLAGS}-Wno-error=clobbered ")
-  endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-endif(enable_compile_warnings)
+  endif()
+  if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    string(REPLACE "-Wclobbered " "" warnCFLAGS "${warnCFLAGS}")
+  endif()
+
+  set(CMAKE_Fortran_FLAGS "-Wall") # FIXME: Q&D hack
+
+  set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
+endif()
 
 if(enable_compile_optimizations)
   set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
   if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
     set(optCFLAGS "${optCFLAGS}-flto ")
-  endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-else(enable_compile_optimizations)
+  endif()
+else()
   set(optCFLAGS "-O0 ")
-endif(enable_compile_optimizations)
+endif()
 
 if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
   set(optCFLAGS "-O0 ")
-endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
+endif()
 
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
-endif(NOT enable_debug)
+endif()
 
 if(enable_msg_deprecated)
   set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
-endif(enable_msg_deprecated)
+endif()
 
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
@@ -47,7 +52,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 # Try to make Mac a bit more complient to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
-endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+endif()
 
 set(TESH_OPTION "")
 if(enable_coverage)
@@ -56,22 +61,23 @@ if(enable_coverage)
     SET(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOVERAGE")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fprofile-arcs -ftest-coverage")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
     set(TESH_OPTION --enable-coverage)
     add_definitions(-fprofile-arcs -ftest-coverage)
-  endif(GCOV_PATH)
-endif(enable_coverage)
+  endif()
+endif()
 
 if(NOT $ENV{CFLAGS} STREQUAL "")
   message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}")
-endif(NOT $ENV{CFLAGS} STREQUAL "")
+endif()
 
 if(NOT $ENV{LDFLAGS} STREQUAL "")
   message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS")
   set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}")
-endif(NOT $ENV{LDFLAGS} STREQUAL "")
+endif()
 
 if(enable_model-checking AND enable_compile_optimizations)
   message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ")
-endif(enable_model-checking AND enable_compile_optimizations)
+endif()