X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0999a1afb538c9e20c15c2516d575893a68f223..8db5b24ed8e2ac545a35960a4e90a0f6ff0e51ed:/buildtools/Cmake/src/CMakeDefinePackages.txt

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 392f7722e9..5229b31d08 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -283,7 +283,6 @@ set(AMOK_SRC
 
 set(LUA_SRC
 	${PROJECT_DIRECTORY}/src/simix/smx_context_lua.c
-	#${PROJECT_DIRECTORY}/src/bindings/lua/Msglua.c
 	${PROJECT_DIRECTORY}/src/bindings/lua/simgrid_lua.c
 )
 
@@ -307,18 +306,23 @@ ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
 )
 
+set(install_bins
+${PROJECT_DIRECTORY}/src/smpi/smpicc
+${PROJECT_DIRECTORY}/src/smpi/smpirun
+)
+
 set(install_libs
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*
 ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
 )
-if(HAVE_RUBY_H)
+if(HAVE_RUBY)
 	set(install_libs
 	${install_libs}
 	${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.*
 	)
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY)
 
 set(install_HEADERS
 ./include/gras.h 
@@ -408,7 +412,6 @@ set(SRC_TO_LOOK
 ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd
 ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd
 ${PROJECT_DIRECTORY}/src/simdag/dax.dtd
-${PROJECT_DIRECTORY}/src/simgrid_units_main.c
 ${PROJECT_DIRECTORY}/examples/gras/ping/ping.xml
 ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.xml
 ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn.xml
@@ -517,17 +520,19 @@ else(${HAVE_JAVA})
 	)
 endif(${HAVE_JAVA})
 
-if(${HAVE_RUBY_H})
+if(${HAVE_RUBY})
 	set(simgrid_sources
 		${simgrid_sources}
 		${RUBY_SRC}
+		${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c
 	)
-else(${HAVE_RUBY_H})
+else(${HAVE_RUBY})
 	set(EXTRA_DIST
 		${EXTRA_DIST}
 		${RUBY_SRC}
+		${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c
 	)
-endif(${HAVE_RUBY_H})
+endif(${HAVE_RUBY})
 
 file(GLOB_RECURSE add_src_files
 "${PROJECT_DIRECTORY}/examples/*.c"
@@ -681,6 +686,39 @@ set(to_svg
 	${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
 	${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
 	${PROJECT_DIRECTORY}/./src/simgrid_units_main.c
+	${PROJECT_DIRECTORY}/./src/cunit_unit.c
+	${PROJECT_DIRECTORY}/./src/ex_unit.c
+	${PROJECT_DIRECTORY}/./src/dynar_unit.c
+	${PROJECT_DIRECTORY}/./src/dict_unit.c
+	${PROJECT_DIRECTORY}/./src/set_unit.c
+	${PROJECT_DIRECTORY}/./src/swag_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_str_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_strbuff_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_sha_unit.c
+	${PROJECT_DIRECTORY}/./src/config_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_synchro_unit.c
+	${PROJECT_DIRECTORY}/./src/bindings/lua/master_slave.lua
+	${PROJECT_DIRECTORY}/./src/bindings/lua/mult_matrix.lua
+	${PROJECT_DIRECTORY}/./examples/lua/master_slave.lua
+	${PROJECT_DIRECTORY}/./examples/lua/mult_matrix.lua
+	${PROJECT_DIRECTORY}/./examples/lua/README
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/MasterSlave.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/MasterSlaveData.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/PingPong.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/Quicksort.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/README
+	${PROJECT_DIRECTORY}/./examples/ruby/MasterSlave.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/PingPong.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/Quicksort.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/example.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/extconfig.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_task.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_task.h
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_workstation.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_workstation.h
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_simdag.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/simdag.rb
 )
 set(script_to_install
 	${PROJECT_DIRECTORY}/./src/smpi/smpicc