Change way to find lib ruby name.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7684 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 4778c66..512b1c9 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -58,10 +58,13 @@ if(enable_ruby)
        include(FindRuby)
        if(RUBY_LIBRARY)
                if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
        include(FindRuby)
        if(RUBY_LIBRARY)
                if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")

-                       string(REGEX REPLACE "libruby.*" "" LIB_RUBY_PATH "${RUBY_LIBRARY}")
-                       string(REPLACE "${LIB_RUBY_PATH}lib" "" LIB_RUBY_VERSION "${RUBY_LIBRARY}")
-                       string(REGEX REPLACE "[.].[a-z]$" "" LIB_RUBY_VERSION "${LIB_RUBY_VERSION}")
-                       SET(CMAKE_EXE_LINKER_FLAGS "-L${LIB_RUBY_PATH}")
+                       set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
+                       string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
+                       if(NOT RUBY_LIBRARY_NAME)
+                               set(RUBY_LIBRARY_NAME ruby)
+                       endif(NOT RUBY_LIBRARY_NAME)
+                       string(REGEX REPLACE "libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
+                       SET(CMAKE_EXE_LINKER_FLAGS "-L${RUBY_LIBRARY}")

                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
                        string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
                        if(NOT operation)
                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
                        string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
                        if(NOT operation)

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 31be6d6..49870b3 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -23,7 +23,7 @@ set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)

-       set(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_RUBY_VERSION} -module")
+       set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module")

        exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
        exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 0d3f76d..393277b 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -72,7 +72,10 @@ if(enable_print_message)
        message("RUBY_EXE :                     ${RUBY_EXECUTABLE}")
        message("RUBY.H :                       ${RUBY_INCLUDE_DIR}")
        message("CONFIG.H :                     ${RUBY_CONFIG_INCLUDE_DIR}")
        message("RUBY_EXE :                     ${RUBY_EXECUTABLE}")
        message("RUBY.H :                       ${RUBY_INCLUDE_DIR}")
        message("CONFIG.H :                     ${RUBY_CONFIG_INCLUDE_DIR}")

-       message("LIB_RUBY :                     ${LIB_RUBY_PATH}${LIB_RUBY_VERSION}")
+       message("LIB_RUBY :                     ${RUBY_LIBRARY}")
+       message("LIB_RUBY_VERSION :     ${LIB_RUBY_VERSION}")
+       message("")
+       

        message("JNI.H :                        ${JAVA_INCLUDE_PATH}")
        message("JNI_MD.H :                     ${JAVA_INCLUDE_PATH2}")
        message("JAVAC :                        ${JAVA_COMPILE}")
        message("JNI.H :                        ${JAVA_INCLUDE_PATH}")
        message("JNI_MD.H :                     ${JAVA_INCLUDE_PATH2}")
        message("JAVAC :                        ${JAVA_COMPILE}")