Fix compilation problem with library path.

Cosmetics

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32bfee1..6b731a4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ if(WIN32)
     endif(PEXPORTS_PATH)
 else(WIN32)
     target_link_libraries(SG_java pcre pthread simgrid)
-    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
 endif(WIN32)
 
 # java_classes

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index b874fef..168c9c9 100644 (file)
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -16,22 +16,23 @@ find_path(SIMGRID_INCLUDES msg/msg.h
 
 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)
 
-message(STATUS "Simgrid: ${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)