From: Martin Quinson Date: Mon, 27 Jul 2015 22:42:00 +0000 (+0200) Subject: Don't forbid the use of MSVC, to test AppVeyor X-Git-Tag: v3_12~360 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1976ec5136c040701aa8b334f131e01c565e7852 Don't forbid the use of MSVC, to test AppVeyor --- diff --git a/CMakeLists.txt b/CMakeLists.txt index abfa14c7df..d27ec86ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,10 +33,14 @@ include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) if(COMPILER_SUPPORTS_CXX11) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -else() - message(FATAL_ERROR - "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. " - "Please use a decent C++ compiler.") +else() + if(MSVC) + message("MSVC is believed to have a sufficient C++11 support. Not sure") + else() + message(FATAL_ERROR + "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. " + "Please use a decent C++ compiler.") + endif() endif() ### And we need C11 standard, too @@ -45,13 +49,16 @@ CHECK_C_COMPILER_FLAG("-std=gnu11" COMPILER_SUPPORTS_C11) if(COMPILER_SUPPORTS_C11) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") 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).") + if(MSVC) + message("MSVC is believed to have a sufficient C++11 support. Not sure") + 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).") + endif() 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 @@ -149,7 +156,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 @@ -218,7 +225,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