X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/607246027b94deeef53d7ca662bf25adfe5973ce..d361c30098e42da8df50e89e3e137b52dd70d09d:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b47bdd626b..105c070e62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ endif() ## Check the C/C++ standard that we need ## See also tools/cmake/Flags.cmake that sets our paranoid warning flags if (MSVC) - message("MicroSoft Visual C detected.") -else # gcc or clang + message("-- You are compiling SimGrid with MicroSoft Visual C. Good luck.") +else() # gcc or clang INCLUDE(CheckCCompilerFlag) CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER) @@ -61,7 +61,7 @@ else # gcc or clang message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5)") set(HAVE_UCONTEXT_H 0) endif() -endif# NOT MSVC +endif() # NOT MSVC ### SMPI vs. Fortran if ((NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by default @@ -137,11 +137,6 @@ endif() exec_program("${CMAKE_LINKER} --version" OUTPUT_VARIABLE "LINKER_VERSION") string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}") -string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}") -if(VBC) - message("VB is not yet supported by Simgrid. Proceed with extrem caution") -endif() - ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) include(FindPerl) @@ -207,8 +202,6 @@ if(WIN32) if(COMPILER_C_MINOR_VERSION) # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION}) endif() - else() - message("You REALLY should use MinGW to compile SimGrid on Windows!") endif() set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432}) @@ -249,8 +242,10 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake) -### Setup gcc flags -include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake) +### Setup gcc & clang flags +if (NOT MSVC) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake) +endif() ### Make Libs if(NOT WIN32)