Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Remove test for cmake 2.8 it fails the first time
authornavarro <navarro@caraja.(none)>
Thu, 22 Mar 2012 14:33:07 +0000 (15:33 +0100)
committernavarro <navarro@caraja.(none)>
Thu, 22 Mar 2012 15:20:16 +0000 (16:20 +0100)
buildtools/Cmake/Modules/FindSimGrid.cmake

index 79aaa78..69b55de 100644 (file)
@@ -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")
 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)
 else(HAVE_SIMGRID_LIB)
   message(STATUS "Looking for lib SimGrid - not found")
 endif(HAVE_SIMGRID_LIB)