From 5519309e40fb5fb223a26cb1037a47046878996f Mon Sep 17 00:00:00 2001 From: navarro Date: Thu, 22 Mar 2012 15:33:07 +0100 Subject: [PATCH] Remove test for cmake 2.8 it fails the first time --- buildtools/Cmake/Modules/FindSimGrid.cmake | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/buildtools/Cmake/Modules/FindSimGrid.cmake b/buildtools/Cmake/Modules/FindSimGrid.cmake index 79aaa78810..69b55deb16 100644 --- a/buildtools/Cmake/Modules/FindSimGrid.cmake +++ b/buildtools/Cmake/Modules/FindSimGrid.cmake @@ -66,16 +66,14 @@ find_program(HAVE_GRAS_STUB message(STATUS "Looking for lib SimGrid") if(HAVE_SIMGRID_LIB) message(STATUS "Looking for lib SimGrid - found") - if(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7") #need cmake version 2.8 - get_filename_component(simgrid_version ${HAVE_SIMGRID_LIB} REALPATH) - string(REPLACE "${HAVE_SIMGRID_LIB}." "" simgrid_version "${simgrid_version}") - string(REGEX MATCH "^[0-9]" SIMGRID_MAJOR_VERSION "${simgrid_version}") - string(REGEX MATCH "^[0-9].[0-9]" SIMGRID_MINOR_VERSION "${simgrid_version}") - string(REGEX MATCH "^[0-9].[0-9].[0-9]" SIMGRID_PATCH_VERSION "${simgrid_version}") - string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") - string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}") - message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}") - endif(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7") + get_filename_component(simgrid_version ${HAVE_SIMGRID_LIB} REALPATH) + string(REPLACE "${HAVE_SIMGRID_LIB}." "" simgrid_version "${simgrid_version}") + string(REGEX MATCH "^[0-9]" SIMGRID_MAJOR_VERSION "${simgrid_version}") + string(REGEX MATCH "^[0-9].[0-9]" SIMGRID_MINOR_VERSION "${simgrid_version}") + string(REGEX MATCH "^[0-9].[0-9].[0-9]" SIMGRID_PATCH_VERSION "${simgrid_version}") + string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") + string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}") + message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}") else(HAVE_SIMGRID_LIB) message(STATUS "Looking for lib SimGrid - not found") endif(HAVE_SIMGRID_LIB) -- 2.20.1