From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 8 Apr 2010 17:05:08 +0000 (+0000)
Subject: Remove old lib simgrid_ruby for include ruby source file to libsimgrid.
X-Git-Tag: SVN~256
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1236336511a8af3ebad37b21c641ca1c12639a98

Remove old lib simgrid_ruby for include ruby source file to libsimgrid.

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 39c5b1d8e7..1b1f7986b5 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -525,11 +525,13 @@ if(${HAVE_RUBY})
 	set(simgrid_sources
 		${simgrid_sources}
 		${RUBY_SRC}
+		${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c
 	)
 else(${HAVE_RUBY})
 	set(EXTRA_DIST
 		${EXTRA_DIST}
 		${RUBY_SRC}
+		${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c
 	)
 endif(${HAVE_RUBY})
 
diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 9f031af08c..cae7627cd5 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -14,10 +14,8 @@ set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
-	add_library(simgrid_ruby SHARED ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
-	set(RUBY_DEP "-lm -module")
-	target_link_libraries(simgrid_ruby 	simgrid ${RUBY_DEP} -fprofile-arcs)
-	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.so ${PROJECT_DIRECTORY}/examples/ruby/simgrid_ruby.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+	set(SIMGRID_DEP "${SIMGRID_DEP} -lm -module")
+	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/ruby/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 4136adb164..2e66a20a99 100644
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -104,7 +104,6 @@ message("	Tracing mode   :	${enable_tracing}")
 message("")
 message("	Simgrid dependencies: 	${SIMGRID_DEP}")
 message("	Gras dependencies   : 	${GRAS_DEP}")
-message("	Ruby dependencies   : 	${RUBY_DEP}")
 message("	Smpi dependencies   : 	${SMPI_DEP}")
 message("")
 message("	USER_PREFIX   : 	${prefix}")