Restruct

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

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 373bc52..86200ac 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -10,11 +10,10 @@ else(supernovae)
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "")
+set(SIMGRID_DEP "ruby1.8")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY_H)
-       set(SIMGRID_DEP "ruby1.8")
        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)
@@ -43,6 +42,11 @@ if(HAVE_GTNETS)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 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})
+endif(NOT HAVE_RUBY_H)
+
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static   ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)