Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java

[simgrid.git] / FindSimGrid.cmake

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index 0ad3753..168c9c9 100644 (file)
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -5,36 +5,35 @@ 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
 )
 
 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")