also fix the way we look for the simgrid library

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b63190..4463d3d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}")
 #########
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
 set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I${SIMGRID_INCLUDES}")
-set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib")
+set(LIB_PATH "-L${SIMGRID_LIB}")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH} -DMSG_USE_DEPRECATED")
 
 if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
@@ -271,10 +271,10 @@ set(test_list basic pingPong CommTime mutualExclusion bypass kill)
 if(APPLE)
     if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
         set_tests_properties(${test_list}
-        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
+        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
     else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
         set_tests_properties(${test_list}
-        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
+        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
     endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
 endif(APPLE)
 
@@ -283,10 +283,10 @@ endif(APPLE)
 ##########################################
 if($ENV{LD_LIBRARY_PATH} STREQUAL "")
     set_tests_properties(${test_list}
-    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
+    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
 else($ENV{LD_LIBRARY_PATH} STREQUAL "")
     set_tests_properties(${test_list}
-    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib")
+    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
 endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
 
 ###########

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index 220d690..ebc56cd 100644 (file)
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -1,7 +1,7 @@
 #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}
@@ -15,11 +15,11 @@ find_path(SIMGRID_INCLUDES msg.h
 )
 
 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,9 +27,9 @@ 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 "Looking for msg.h")
 if(SIMGRID_INCLUDES)
@@ -38,7 +38,7 @@ else(SIMGRID_INCLUDES)
   message(STATUS "Looking for msg.h - not found")
 endif(SIMGRID_INCLUDES)
 
-if(HAVE_SIMGRID_LIB AND SIMGRID_INCLUDES)
-else(HAVE_SIMGRID_LIB AND 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(HAVE_SIMGRID_LIB AND SIMGRID_INCLUDES)
\ No newline at end of file
+endif(SIMGRID_LIB AND SIMGRID_INCLUDES)
\ No newline at end of file