X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..fce3a86dd4d407dad48652984bf5bf0444f37170:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index ff6cbe1cad..83eb99b4d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default endif() set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_CXX_FLAGS " -std=c++11 " CACHE TYPE INTERNAL FORCE) +set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_C_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_Fortran_FLAGS "" CACHE TYPE INTERNAL FORCE) @@ -170,9 +170,9 @@ if(WIN32) message(FATAL_ERROR "Please use MinGW to compile SimGrid!") endif() - if(ARCH_32_BITS) ### Arch 32bits + if(ARCH_32_BITS) ### Arch 32bits set(_WIN32 1) - else() ### Arch 64bits + else() ### Arch 64bits set(_WIN64 1) endif() @@ -184,18 +184,18 @@ if(WIN32) set(_XBT_WIN32 1) - message(STATUS "C_COMPILER ${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}") - message(STATUS "CXX_COMPILER ${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}") - message(STATUS "CMAKE_RC_COMPILER ${CMAKE_RC_COMPILER}") - message(STATUS "INCLUDE ${CMAKE_INCLUDE_WIN}") - message(STATUS "LIB ${CMAKE_LIB_WIN}") - message(STATUS "MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") - 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}") + message(STATUS "C_COMPILER ${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}") + message(STATUS "CXX_COMPILER ${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}") + message(STATUS "CMAKE_RC_COMPILER ${CMAKE_RC_COMPILER}") + message(STATUS "INCLUDE ${CMAKE_INCLUDE_WIN}") + message(STATUS "LIB ${CMAKE_LIB_WIN}") + message(STATUS "MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") + 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()