[jenkins] Check build mode before making the archive

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e280cd8..abfa14c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
 
+if (CMAKE_COMPILER_IS_GNUCC)
+  if (COMPILER_CXX_VERSION_MAJOR_MINOR STRLESS "4.7")
+    message(FATAL_ERROR
+            "SimGrid needs at least g++ version 4.7 to compile "
+           "(c++11 support of previous versions is too limited).")
+  endif()
+endif()
+
 ## We need a decent support of the c++11 standard
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
@@ -30,13 +38,6 @@ else()
           "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. "
          "Please use a decent C++ compiler.")
 endif()
-if (CMAKE_COMPILER_IS_GNUCC)
-  if (COMPILER_CXX_VERSION_MAJOR_MINOR STRLESS "4.7")
-    message(FATAL_ERROR
-            "SimGrid needs g++ version 4.7 to compile "
-           "(c++11 support of previous versions is too limited).")
-  endif()
-endif()
 
 ### And we need C11 standard, too
 include(CheckCCompilerFlag)
@@ -216,8 +217,6 @@ if(WIN32)
     if(COMPILER_C_MINOR_VERSION)
       # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
     endif()
-    set(MSVC 0)
-    set(BORLAND 0)
   else()
     message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
   endif()
@@ -247,8 +246,6 @@ if(WIN32)
   message(STATUS "CMAKE_BUILD_TOOL              ${CMAKE_BUILD_TOOL}")
   message(STATUS "LINKER                        ${CMAKE_LINKER}")
   message(STATUS "CMAKE_GENERATOR               ${CMAKE_GENERATOR}")
-  message(STATUS "BORLAND                       ${BORLAND}")
-  message(STATUS "VISUALC                       ${MSVC}")
   message(STATUS "GNUC                          ${CMAKE_COMPILER_IS_GNUCC}")
 
 endif()