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

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index a5d247f1df..4bf7a04571 100644
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -1,77 +1,44 @@
-#IF YOU HAVE INSTALL SIMGRID LIBRARIES AND SIMGRID BINARIES IN A SPECIAL DIRECTORY
-#YOU CAN SPECIFY SIMGRID_LIBRARY_PAT AND SIMGRID_BIN_PATH OR SIMPLY LD_LIBRARY_PATH
+#IF YOU HAVE INSTALL SIMGRID IN A SPECIAL DIRECTORY
+#YOU CAN SPECIFY SIMGRID_ROOT OR GRAS_ROOT
 
-# TO CALL THIS FILE USE
-	#set(CMAKE_MODULE_PATH 
-	#${CMAKE_MODULE_PATH}
-	#${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-	#)
-
-message("SIMGRID_LIBRARY_PATH	= $ENV{SIMGRID_LIBRARY_PATH}")
-message("SIMGRID_BIN_PATH	= $ENV{SIMGRID_BIN_PATH}")
-message("LD_LIBRARY_PATH	= $ENV{LD_LIBRARY_PATH}")
-
-find_library(HAVE_SIMGRID_LIB
+find_library(SIMGRID_LIB
     NAME simgrid
     HINTS
-    $ENV{LIBRARIES}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{SIMGRID_LIBRARY_PATH}
-    PATH_SUFFIXES lib64 lib simgrid/lib64 simgrid/lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
+	$ENV{SIMGRID_ROOT}
+    PATH_SUFFIXES lib
 )
 
-find_path(HAVE_GRAS_H gras.h
+find_path(SIMGRID_INCLUDES msg/msg.h
     HINTS
-    $ENV{INCLUDES}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{SIMGRID_LIBRARY_PATH}
-    PATH_SUFFIXES include simgrid/include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
-
-string(REPLACE "/include" "/bin" OPTIONAL_BIN_PATH "HAVE_GRAS_H")
-
-find_program(HAVE_TESH
-NAMES tesh
-HINTS
-$ENV{SIMGRID_BIN_PATH}
-$ENV{LD_LIBRARY_PATH}
-PATH_SUFFIXES bin simgrid/bin
-PATHS
-${OPTIONAL_BIN_PATH}
-/opt
-/opt/local
-/opt/csw
-/sw
-/usr
-)
-
-find_program(HAVE_GRAS_STUB
-NAMES gras_stub_generator
-HINTS
-$ENV{SIMGRID_BIN_PATH}
-$ENV{LD_LIBRARY_PATH}
-PATH_SUFFIXES bin simgrid/bin
-PATHS
-/opt
-/opt/local
-/opt/csw
-/sw
-/usr
+	$ENV{SIMGRID_ROOT}
+    PATH_SUFFIXES include
 )
 
-message("HAVE_SIMGRID_LIB 	= ${HAVE_SIMGRID_LIB}")
-message("HAVE_GRAS_H 		= ${HAVE_GRAS_H}")
-message("HAVE_TESH 		= ${HAVE_TESH}")
-message("HAVE_GRAS_STUB 		= ${HAVE_GRAS_STUB}")
\ No newline at end of file
+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")
+else(SIMGRID_LIB)
+  message(STATUS "Looking for lib SimGrid - not found")
+endif(SIMGRID_LIB)
+
+message(STATUS "Looking for msg.h")
+if(SIMGRID_INCLUDES)
+  message(STATUS "Looking for msg.h - found")
+else(SIMGRID_INCLUDES)
+  message(STATUS "Looking for msg.h - not found")
+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