X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26b2e42d0acbf263115530550dc5773fdf4bf57a..8462a1a27d5d9595a90f6c4f6dc65e70d279e6e3:/FindSimGrid.cmake

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index f92b12db5d..b874fefd4b 100644
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -1,25 +1,25 @@
 #IF YOU HAVE INSTALL SIMGRID IN A SPECIAL DIRECTORY
 #YOU CAN SPECIFY SIMGRID_ROOT OR GRAS_ROOT
 
-find_library(HAVE_SIMGRID_LIB
+find_library(SIMGRID_LIB
     NAME simgrid
     HINTS
 	$ENV{SIMGRID_ROOT}
     PATH_SUFFIXES lib
 )
 
-find_path(HAVE_MSG_H msg.h
+find_path(SIMGRID_INCLUDES msg/msg.h
     HINTS
 	$ENV{SIMGRID_ROOT}
     PATH_SUFFIXES include
 )
 
 message(STATUS "Looking for lib SimGrid")
-if(HAVE_SIMGRID_LIB)
+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 ${HAVE_SIMGRID_LIB} REALPATH)
-	  string(REPLACE "${HAVE_SIMGRID_LIB}." "" simgrid_version "${simgrid_version}")
+	  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}")
@@ -27,18 +27,20 @@ if(HAVE_SIMGRID_LIB)
 	  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(HAVE_SIMGRID_LIB)
+else(SIMGRID_LIB)
   message(STATUS "Looking for lib SimGrid - not found")
-endif(HAVE_SIMGRID_LIB)
+endif(SIMGRID_LIB)
+
+message(STATUS "Simgrid: ${SIMGRID_LIB}")
 
 message(STATUS "Looking for msg.h")
-if(HAVE_MSG_H)
-message(STATUS "Looking for msg.h - found")
-else(HAVE_MSG_H)
-message(STATUS "Looking for msg.h - not found")
-endif(HAVE_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(HAVE_SIMGRID_LIB AND HAVE_MSG_H)
-else(HAVE_SIMGRID_LIB AND HAVE_MSG_H)
-    message(FATAL_ERROR "You need to install simgrid and set environment variable SIMGRID_ROOT!")
-endif(HAVE_SIMGRID_LIB AND HAVE_MSG_H)
\ No newline at end of file
+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