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 260b7c4..def28f4 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -10,7 +10,7 @@ else(supernovae)
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "ruby1.8")
+set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
 if(HAVE_RUBY_H)
@@ -43,8 +43,8 @@ if(HAVE_GTNETS)
 endif(HAVE_GTNETS)
 
 if(NOT HAVE_RUBY_H)
-       string(REPLACE "ruby1.8 -l" "" SIMGRID_DEP ${SIMGRID_DEP})
-       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,8 +52,8 @@ 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")
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid")
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib")
 
 
 ### Make EXEs