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

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 6e5011034e..09753b0764 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -1,9 +1,29 @@
 set(warnCFLAGS "")
 set(optCFLAGS "")
 
+include(CheckCXXCompilerFlag)
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  if (COMPILER_C_VERSION_MAJOR_MINOR STRLESS "4.7")
+    message(FATAL_ERROR "SimGrid needs g++ version 4.7 to compile.")
+  endif()
+endif()
+
 if(NOT __VISUALC__ AND NOT __BORLANDC__)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-std=gnu99 -g3")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
+  CHECK_CXX_COMPILER_FLAG("-std=gnu++11" HAVE_CXX11)
+  CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" HAVE_CXX0X)
+  if(HAVE_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+  elseif(HAVE_CXX0X)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+  else()
+    message(FATAL_ERROR "Missing support for C++11.")
+  endif()
+endif()
+
+if(NOT __VISUALC__ AND NOT __BORLANDC__)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g3")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
 else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
@@ -12,18 +32,14 @@ endif()
 
 if(enable_compile_warnings)
   set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
-  if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  if(CMAKE_COMPILER_IS_GNUCC)
     set(warnCFLAGS "${warnCFLAGS}-Wclobbered -Wno-error=clobbered ")
-    if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-      set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
-    endif()
-    if(COMPILER_C_VERSION_MAJOR_MINOR STREQUAL "4.6")
-    #some old compilers emit bogus warnings here, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45978 . Avoid failing the build in this case
-      set(warnCFLAGS "${warnCFLAGS}-Wno-error=array-bounds")
-    endif()
   endif()
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra  -Wunused -Wpointer-arith -Wchar-subscripts -Wcomment -Wno-unknown-warning-option -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wclobbered -Wno-error=clobbered -Wno-format-nonliteral -Werror")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra  -Wunused -Wpointer-arith -Wchar-subscripts -Wcomment  -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror")
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered -Wno-error=clobbered")
+  endif()
 
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
 
@@ -41,7 +57,7 @@ if(enable_compile_optimizations)
       endif()
     else()    
       # On non-windows, 4.6 is enough for that
-      if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5" AND LINKER_VERSION STRGREATER "2.22")
+      if(LINKER_VERSION STRGREATER "2.22")
         set(optCFLAGS "${optCFLAGS} -flto ")
       endif()
     endif()
@@ -50,21 +66,32 @@ else()
   set(optCFLAGS "-O0 ")
 endif()
 
+if(enable_sdt)
+  add_definitions(-DUSE_SDT)
+endif()
+
+if(enable_ust)
+  add_definitions(-DUSE_UST)
+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:
   foreach(s
-      # src/xbt/mmalloc/mm.c
-      # src/xbt/snprintf.c src/xbt/log.c
-      # src/xbt/dynar.c
-      # src/xbt/set.c src/xbt/setset.c
-      # src/xbt/backtrace_linux.c
-      src/mc/mc_dwarf_expression.c src/mc/mc_dwarf.c src/mc/mc_member.c
-      src/mc/mc_snapshot.c src/mc/mc_page_store.cpp src/mc/mc_page_snapshot.cpp
-      src/mc/mc_compare.cpp src/mc/mc_diff.c
-      src/mc/mc_dwarf.c src/mc/mc_dwarf_attrnames.h src/mc/mc_dwarf_expression.c src/mc/mc_dwarf_tagnames.h
-      src/mc/mc_set.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.c src/xbt/dict_elm.c src/xbt/dict_multi.c src/xbt/dict_cursor.c
+      src/xbt/set.c src/xbt/setset.c
+      src/xbt/dynar.c src/xbt/fifo.c src/xbt/heap.c src/xbt/swag.c
+      src/xbt/str.c src/xbt/strbuff.c src/xbt/snprintf.c
+      src/xbt/queue.c
+      src/xbt/xbt_os_time.c src/xbt/xbt_os_thread.c
+      src/xbt/sha.c
+      src/xbt/matrix.c
+      src/xbt/backtrace_linux.c
+      ${MC_SRC_BASE} ${MC_SRC})
       set (mcCFLAGS "-O3  -funroll-loops -fno-strict-aliasing")
        if(CMAKE_COMPILER_IS_GNUCC)
          set (mcCFLAGS "${mcCFLAGS} -finline-functions")
@@ -73,11 +100,6 @@ if(enable_model-checking AND enable_compile_optimizations)
   endforeach()
 endif()
 
-if(enable_mc_content_adressable_pages)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMC_PAGE_STORE_MD4")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMC_PAGE_STORE_MD4")
-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 ")
@@ -98,7 +120,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")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
 
 set(TESH_OPTION "")