Solve problem with lib name of java ruby and lua.

[simgrid.git] / buildtools / Cmake / src / CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 96cd186..def28f4 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -10,9 +10,14 @@ else(supernovae)
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "ruby1.8")
+set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
+if(HAVE_RUBY_H)
+       add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
+       set(RUBY_DEP "-lm -module")
+       target_link_libraries(simgrid_ruby      simgrid ${RUBY_DEP} -fprofile-arcs)
+endif(HAVE_RUBY_H)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        add_definitions("-D_XOPEN_SOURCE")
@@ -30,21 +35,16 @@ if(pthread)
 endif(pthread)
 
 if(HAVE_LUA)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -llua5.1")
+       SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
 endif(HAVE_LUA)
 
-if(HAVE_RUBY_H)
-add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
-set(RUBY_DEP "-lm -module")
-target_link_libraries(simgrid_ruby     simgrid ${RUBY_DEP} -fprofile-arcs)
-endif(HAVE_RUBY_H)
-
 if(HAVE_GTNETS)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
 if(NOT HAVE_RUBY_H)
-string(REPLACE "ruby1.8 " "" SIMGRID_DEP ${SIMGRID_DEP})
+       string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
+       string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
 endif(NOT HAVE_RUBY_H)
 
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
@@ -52,6 +52,10 @@ target_link_libraries(simgrid_static ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
 
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid")
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib")
+
+
 ### Make EXEs
 
 #tools