From: navarrop Date: Thu, 10 Feb 2011 12:57:15 +0000 (+0000) Subject: Add a verification on gcc version. X-Git-Tag: v3.6_beta2~331 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7951b2d0118b44426367d128f5229eb3e3960536?hp=23a2059333732be618364bbd4bb149e3b1f7c112 Add a verification on gcc version. On mac we must have gcc45. Set by default to gcc40 for other. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9599 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c20410c29..0a598eb457 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,39 @@ set(release_version "3.5") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") +set(GCC_NEED_VERSION "4.0") + +### SET THE LIBRARY EXTENSION AND GCC VERSION +if(APPLE) #MAC + set(GCC_NEED_VERSION "4.5") + set(LIB_EXE "dylib") +else(APPLE) + if(WIN32) #WINDOWS + set(LIB_EXE "a") + else(WIN32) #UNIX + set(LIB_EXE "so") + endif(WIN32) +endif(APPLE) + +string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}") +if(GCC) + exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION") + exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION") + string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}") + string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}") + + string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_VERSION_MAJOR_MINOR "${COMPILER_C_VERSION}") + string(REPLACE "${COMPILER_C_VERSION_MAJOR_MINOR}." "" COMPILER_C_VERSION_PATCH "${COMPILER_C_VERSION}") + + if(${GCC_NEED_VERSION} GREATER COMPILER_C_VERSION_MAJOR_MINOR) + message(FATAL_ERROR "Gcc must be to version ${GCC_NEED_VERSION} current version ${COMPILER_C_VERSION_MAJOR_MINOR}") + endif(${GCC_NEED_VERSION} GREATER COMPILER_C_VERSION_MAJOR_MINOR) +endif(GCC) + +string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}") +if(VBC) + message(FATAL_ERROR "VB is not yet supported by Simgrid.") +endif(VBC) ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) @@ -33,17 +66,6 @@ if(UNIX AND NOT APPLE) endif(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR}) endif(UNIX AND NOT APPLE) -### SET THE LIBRARY EXTENSION -if(APPLE) - set(LIB_EXE "dylib") -else(APPLE) - if(WIN32) - set(LIB_EXE "a") - else(WIN32) - set(LIB_EXE "so") - endif(WIN32) -endif(APPLE) - ### Set some variables for Cmake SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index be1d029dc4..46c9443669 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -1,22 +1,3 @@ -string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}") -string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}") -if(VBC) - exec_program("${CMAKE_C_COMPILER}" OUTPUT_VARIABLE "COMPILER_C_V") - string(REPLACE "\n" ";" COMPILER_C_V "${COMPILER_C_V}") - foreach(line ${COMPILER_C_V}) - if(NOT COMPILER_C_VERSION) - set(COMPILER_C_VERSION "${line}") - set(COMPILER_CXX_VERSION "${line}") - endif(NOT COMPILER_C_VERSION) - endforeach(line ${COMPILER_C_V}) -endif(VBC) -if(GCC) - exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION") - exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION") - string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}") - string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}") -endif(GCC) - if(enable_print_message) message("") message("________________________________________________________________________________")