X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05eb4d3f2c9a2a8b25072c6d48708bd18c7a39f6..f3882bfdbd3264807a5d3a9d1b05424f417f9d28:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 6756c21f97..1c01327d2e 100755
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -268,6 +268,13 @@ set(SIMDAG_SRC
 	src/simdag/sd_workstation.c
 	src/simdag/sd_daxloader.c
 )
+if(HAVE_CGRAPH_H)
+	set(SIMDAG_SRC
+		${SIMDAG_SRC}
+		src/simdag/sd_dotloader.c
+	)
+
+endif(HAVE_CGRAPH_H)
 
 set(GRAS_COMMON_SRC
 	src/gras/gras.c
@@ -314,9 +321,11 @@ set(AMOK_SRC
 set(LUA_SRC
 	src/simix/smx_context_lua.c
 	src/bindings/lua/simgrid_lua.c
+	src/bindings/lua/lua_stub_generator.c
 )
 
 set(TRACING_SRC
+	src/instr/instr_config.c
 	src/instr/interface.c
 	src/instr/general.c
 	src/instr/paje.c
@@ -325,6 +334,7 @@ set(TRACING_SRC
 	src/instr/msg_volume.c
 	src/instr/smx_instr.c
 	src/instr/surf_instr.c
+	src/instr/smpi_instr.c
 	src/instr/variables_instr.c
 	src/instr/private.h
 )
@@ -400,7 +410,6 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/instr/tracing_config.h
 include/simgrid_config.h
 include/gras.h 
 include/xbt.h
@@ -544,23 +553,6 @@ else(${HAVE_RUBY})
 	)
 endif(${HAVE_RUBY})
 
-file(GLOB_RECURSE add_src_files
-"examples/*.c"
-"teshsuite/*.c"
-"testsuite/*.c"
-"tools/*.c"
-"examples/*.cxx"
-"teshsuite/*.cxx"
-"testsuite/*.cxx"
-"tools/*.cxx"
-"examples/*CMakeLists.txt"
-"teshsuite/*CMakeLists.txt"
-"testsuite/*CMakeLists.txt"
-"tools/*CMakeLists.txt"
-"src/*CMakeLists.txt"
-"examples/*.java"
-)
-
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
@@ -587,6 +579,42 @@ foreach(file ${new_examples_to_install_in_doc})
 	endif(NOT OPERATION)
 endforeach(file ${new_examples_to_install_in_doc})
 
+file(GLOB_RECURSE add_src_files
+"teshsuite/*.c"
+"teshsuite/*.cxx"
+"testsuite/*.c"
+"testsuite/*.cxx"
+"tools/*.c"
+"tools/*.cxx"
+"examples/*.c"
+"examples/*.cxx"
+"examples/*.java"
+"examples/*.lua"
+"examples/*.rb"
+"src/bindings/*.lua"
+"src/bindings/*.rb"
+"src/bindings/*.c"
+"src/bindings/*.h"
+"*CMakeLists.txt"
+)
+set(add_src_files
+	${add_src_files}
+	src/smpi/smpicc.in
+	src/smpi/smpirun.in
+	src/simix/smx_context_sysv_private.h
+	src/simgrid_units_main.c
+	src/cunit_unit.c
+	src/ex_unit.c
+	src/dynar_unit.c
+	src/dict_unit.c
+	src/set_unit.c
+	src/swag_unit.c
+	src/xbt_str_unit.c
+	src/xbt_strbuff_unit.c
+	src/xbt_sha_unit.c
+	src/config_unit.c
+	src/xbt_synchro_unit.c
+)
 
 file(GLOB_RECURSE include_files
 "include/*.h"
@@ -598,7 +626,6 @@ file(GLOB_RECURSE include_files
 "src/*.h.in"
 "include/*.h.in"
 )
-#message("\n\ninclude:\n${include_files}")
 
 file(GLOB_RECURSE xml_files
 "examples/*.xml"
@@ -608,7 +635,6 @@ file(GLOB_RECURSE xml_files
 "testsuite/*.xml"
 "tools/*.xml"
 )
-#message("\n\nxml:\n${xml_files}")
 
 file(GLOB_RECURSE tesh_files
 "examples/*.tesh"
@@ -618,7 +644,6 @@ file(GLOB_RECURSE tesh_files
 "testsuite/*.tesh"
 "tools/*.tesh"
 )
-#message("\n\ntesh:\n${tesh_files}")
 
 file(GLOB_RECURSE txt_files
 "testsuite/surf/trace*.txt"
@@ -682,8 +707,37 @@ file(GLOB_RECURSE txt_files
 "examples/java/comm_time/CommTimeTest"
 "examples/java/suspend/SuspendTest"
 )
+set(txt_files
+	${txt_files}
+	AUTHORS
+	ChangeLog
+	COPYING
+	missing
+	NEWS
+	README
+	README.IEEE
+	TODO
+	examples/lua/README
+	examples/ruby/README
+)
+
+file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/test_java.sh"
+"buildtools/Cmake/*.cmake"
+"buildtools/Cmake/*.h.in"
+"buildtools/Cmake/*.pl"
+"buildtools/Cmake/*.sh"
+"buildtools/Cmake/test_prog/*.c"
+"buildtools/Cmake/test_prog/*.cpp"
+)
 
+set(bin_files
+tools/MSG_visualization/colorize.pl
+)
 
+file(GLOB_RECURSE doc_files
+"doc/html/*"
+)
 
 # This is the complete lise of what will be added to the source archive
 set(source_to_pack	
@@ -713,83 +767,7 @@ set(source_to_pack
 	${txt_files}
 	${TEST_CFILES}
 	${EXTRA_DIST}
-	CMakeLists.txt
-	buildtools/Cmake/CTestConfig.cmake
-	buildtools/Cmake/CompleteInFiles.cmake
-	buildtools/Cmake/DefinePackages.cmake
-	buildtools/Cmake/Distrib.cmake
-	buildtools/Cmake/GenerateDoc.cmake
-	buildtools/Cmake/Flags.cmake
-	buildtools/Cmake/MakeJava.cmake
-	buildtools/Cmake/MaintainerMode.cmake
-	buildtools/Cmake/MakeExeLib.cmake
-	buildtools/Cmake/Option.cmake
-	buildtools/Cmake/PrintArgs.cmake
-	buildtools/Cmake/Supernovae.cmake
-	buildtools/Cmake/AddTests.cmake
-	buildtools/Cmake/memcheck_tests.cmake
-	buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
-	buildtools/Cmake/test_prog/prog_getline.c
-	buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
-	buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-	buildtools/Cmake/test_prog/prog_gtnets.cpp
-	buildtools/Cmake/test_prog/prog_max_size.c
-	buildtools/Cmake/test_prog/prog_mutex_timedlock.c
-	buildtools/Cmake/test_prog/prog_printf_null.c
-	buildtools/Cmake/test_prog/prog_sem_init.c
-	buildtools/Cmake/test_prog/prog_sem_timedwait.c
-	buildtools/Cmake/test_prog/prog_snprintf.c
-	buildtools/Cmake/test_prog/prog_stackgrowth.c
-	buildtools/Cmake/test_prog/prog_stacksetup.c
-	buildtools/Cmake/test_prog/prog_va_copy.c
-	buildtools/Cmake/test_prog/prog_vsnprintf.c
-	buildtools/Cmake/gras_config.h.in
-	buildtools/Cmake/tracing_config.h.in
-	AUTHORS
-	ChangeLog
-	COPYING
-	missing
-	NEWS
-	README
-	README.IEEE
-	TODO
-	src/smpi/smpicc.in
-	src/smpi/smpirun.in
-	src/bindings/ruby/simgrid_ruby.c
-	src/bindings/ruby_bindings.h
-	src/simix/smx_context_sysv_private.h
-	src/simgrid_units_main.c
-	src/cunit_unit.c
-	src/ex_unit.c
-	src/dynar_unit.c
-	src/dict_unit.c
-	src/set_unit.c
-	src/swag_unit.c
-	src/xbt_str_unit.c
-	src/xbt_strbuff_unit.c
-	src/xbt_sha_unit.c
-	src/config_unit.c
-	src/xbt_synchro_unit.c
-	src/bindings/lua/master_slave.lua
-	src/bindings/lua/mult_matrix.lua
-	examples/lua/master_slave.lua
-	examples/lua/mult_matrix.lua
-	examples/lua/README
-	src/bindings/ruby/MasterSlave.rb
-	src/bindings/ruby/MasterSlaveData.rb
-	src/bindings/ruby/PingPong.rb
-	src/bindings/ruby/Quicksort.rb
-	src/bindings/ruby/simgrid.rb
-	examples/ruby/README
-	examples/ruby/MasterSlave.rb
-	examples/ruby/PingPong.rb
-	examples/ruby/Quicksort.rb
-	src/bindings/rubyDag/example.rb
-	src/bindings/rubyDag/extconfig.rb
-	src/bindings/rubyDag/rb_SD_task.c
-	src/bindings/rubyDag/rb_SD_task.h
-	src/bindings/rubyDag/rb_SD_workstation.c
-	src/bindings/rubyDag/rb_SD_workstation.h
-	src/bindings/rubyDag/rb_simdag.c
-	src/bindings/rubyDag/simdag.rb
-)
\ No newline at end of file
+	${CMAKE_SOURCE_FILES}
+	${bin_files}
+	${doc_files}
+)