X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbded482153997cb659dda1a6177d93d1ea4f9d0..e1a098b59e3a524d0dd94b00a69419e391bf142a:/FindSimGrid.cmake

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index 0ad3753726..a77a88d608 100644
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -5,36 +5,42 @@ find_library(SIMGRID_LIB
     NAME simgrid
     HINTS
 	$ENV{SIMGRID_ROOT}
-	/usr/local
-	/usr
     PATH_SUFFIXES lib
 )
 
-find_path(SIMGRID_INCLUDES msg.h
+find_path(SIMGRID_INCLUDES msg/msg.h
     HINTS
 	$ENV{SIMGRID_ROOT}
-	/usr/local
-	/usr
     PATH_SUFFIXES include
 )
 
+find_program(TESH_BIN_PATH
+	NAMES tesh
+	HINTS
+	$ENV{SIMGRID_ROOT}
+	PATH_SUFFIXES bin
+)
+
 message(STATUS "Looking for lib SimGrid")
 if(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 ${SIMGRID_LIB} REALPATH)
-	  string(REPLACE "${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")
+  message(STATUS "Looking for lib SimGrid - found")  
+  get_filename_component(simgrid_version ${SIMGRID_LIB} REALPATH)
+  string(REPLACE "${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}")
 else(SIMGRID_LIB)
   message(STATUS "Looking for lib SimGrid - not found")
 endif(SIMGRID_LIB)
 
+string(REGEX REPLACE "libsimgrid.*" "" SIMGRID_LIB_PATH "${SIMGRID_LIB}")
+
+message(STATUS "Simgrid         : ${SIMGRID_LIB}")
+message(STATUS "Simgrid_path    : ${SIMGRID_LIB_PATH}")
+message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}")
+
 message(STATUS "Looking for msg.h")
 if(SIMGRID_INCLUDES)
   message(STATUS "Looking for msg.h - found")
@@ -45,4 +51,8 @@ endif(SIMGRID_INCLUDES)
 if(SIMGRID_LIB AND SIMGRID_INCLUDES)
 else(SIMGRID_LIB AND SIMGRID_INCLUDES)
     message(FATAL_ERROR "Unable to find both the library and the include files. Setting the environment variable SIMGRID_ROOT may help.")
-endif(SIMGRID_LIB AND SIMGRID_INCLUDES)
\ No newline at end of file
+endif(SIMGRID_LIB AND SIMGRID_INCLUDES)
+
+if(TESH_BIN_PATH)
+message(STATUS "Found Tesh: ${TESH_BIN_PATH}")
+endif(TESH_BIN_PATH)
\ No newline at end of file