X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83e06283ac849da0e82a65178c8d19442c25a0d0..fa222c38f9b796be07ab4351ffc810a61a8fd705:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64b80175ae..d874f67c05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,16 +30,13 @@ endif()
 
 ## We need a decent support of the c++11 standard
 include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
 if(COMPILER_SUPPORTS_CXX11)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif(COMPILER_SUPPORTS_CXX0X)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+else() 
   message(FATAL_ERROR 
           "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. "
-	  "Please use a decent C++ compiler.")
+          "Please use a decent C++ compiler.")
 endif()
 
 ### And we need C11 standard, too
@@ -50,11 +47,10 @@ if(COMPILER_SUPPORTS_C11)
 else()
   message(FATAL_ERROR 
           "The compiler ${CMAKE_C_COMPILER} has no C11 support. "
-	  "Please use a decent C compiler "
-	  "(note that c++11 support of ${CMAKE_CXX_COMPILER} seems ok).")
+          "Please use a decent C compiler "
+          "(note that c++11 support of ${CMAKE_CXX_COMPILER} seems ok).")
 endif()
 
-
 ### SMPI vs. Fortran
 if ((NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by default
   # Call enable_language(Fortran) in order to load the build rules for
@@ -152,7 +148,7 @@ string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
 string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
 if(VBC)
-  message(FATAL_ERROR "VB is not yet supported by Simgrid.")
+  message("VB is not yet supported by Simgrid. Proceed with extrem caution")
 endif()
 
 ### Find programs and paths
@@ -221,7 +217,7 @@ if(WIN32)
       # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
     endif()
   else()
-    message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
+    message("You REALLY should use MinGW to compile SimGrid on Windows!")
   endif()
 
   if(ARCH_32_BITS)      ### Arch 32bits