X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cff48d82a03c0c1ffbe2d9f2a32828417e8110bd..2936eb451829affa4985aa05e9d21c2c2a5188c9:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
old mode 100755
new mode 100644
index ddeb0e4b1d..fa0d054941
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -105,6 +105,7 @@ set(SMPI_SRC
 	src/smpi/smpi_bench.c
 	src/smpi/smpi_global.c
 	src/smpi/smpi_mpi.c
+	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
 	src/smpi/smpi_util.c
@@ -240,9 +241,9 @@ set(SIMIX_SRC
 	src/simix/smx_deployment.c
 	src/simix/smx_environment.c
 	src/simix/smx_host.c
+	src/simix/smx_action.c
 	src/simix/smx_process.c
 	src/simix/smx_context.c
-	src/simix/smx_action.c
 	src/simix/smx_synchro.c
 	src/simix/smx_network.c
 	src/simix/smx_context_base.c
@@ -268,13 +269,11 @@ 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
+if(HAVE_GRAPHVIZ)
+	set(SIMDAG_SRC 
+	    ${SIMDAG_SRC} src/simdag/sd_dotloader.c
 	)
-
-endif(HAVE_CGRAPH_H)
+endif(HAVE_GRAPHVIZ)
 
 set(GRAS_COMMON_SRC
 	src/gras/gras.c
@@ -319,12 +318,14 @@ 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
+	src/bindings/lua/lua_console.c
 )
 
 set(TRACING_SRC
 	src/instr/instr_config.c
+	src/instr/categories.c
 	src/instr/interface.c
 	src/instr/general.c
 	src/instr/paje.c
@@ -333,16 +334,19 @@ 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/sd_instr.c
 	src/instr/variables_instr.c
+	src/instr/resource_utilization.c
 	src/instr/private.h
 )
 
 set(RUBY_SRC
-src/simix/smx_context_ruby.c
-src/bindings/ruby/rb_msg_process.c
-src/bindings/ruby/rb_msg_host.c
-src/bindings/ruby/rb_msg_task.c
-src/bindings/ruby/rb_application_handler.c
+	src/simix/smx_context_ruby.c
+	src/bindings/ruby/rb_msg_process.c
+	src/bindings/ruby/rb_msg_host.c
+	src/bindings/ruby/rb_msg_task.c
+	src/bindings/ruby/rb_application_handler.c
 )
 
 set(MC_SRC
@@ -357,93 +361,95 @@ set(MC_SRC
 )
 
 set(install_HEADERS
-include/xbt/misc.h
-include/xbt/sysdep.h
-include/xbt/virtu.h
-include/xbt/str.h
-include/xbt/strbuff.h
-include/xbt/hash.h
-include/xbt/function_types.h
-include/xbt/asserts.h 
-include/xbt/ex.h
-include/xbt/log.h
-include/xbt/module.h
-include/xbt/mallocator.h
-include/xbt/dynar.h
-include/xbt/dict.h
-include/xbt/set.h
-include/xbt/heap.h
-include/xbt/graph.h
-include/xbt/fifo.h
-include/xbt/swag.h
-include/xbt/matrix.h
-include/xbt/peer.h
-include/xbt/config.h
-include/xbt/cunit.h
-include/xbt/graphxml_parse.h
-include/xbt/graphxml.h
-include/xbt/time.h
-include/xbt/synchro.h
-include/xbt/synchro_core.h
-include/xbt/queue.h
-include/xbt/setset.h
-include/xbt/mmalloc.h
-include/mc/modelchecker.h
-include/msg/msg.h
-include/msg/datatypes.h
-include/simdag/simdag.h
-include/simdag/datatypes.h
-include/smpi/smpi.h
-include/smpi/mpi.h
-include/surf/surfxml_parse.h
-include/surf/simgrid_dtd.h
-include/gras/datadesc.h
-include/gras/transport.h
-include/gras/virtu.h
-include/gras/emul.h
-include/gras/process.h
-include/gras/module.h
-include/gras/messages.h
-include/gras/timer.h
-include/amok/peermanagement.h
-include/amok/bandwidth.h
-include/instr/instr.h
-include/simgrid_config.h
-include/gras.h 
-include/xbt.h
+	include/xbt/misc.h
+	include/xbt/sysdep.h
+	include/xbt/virtu.h
+	include/xbt/str.h
+	include/xbt/strbuff.h
+	include/xbt/hash.h
+	include/xbt/function_types.h
+	include/xbt/asserts.h 
+	include/xbt/ex.h
+	include/xbt/log.h
+	include/xbt/module.h
+	include/xbt/mallocator.h
+	include/xbt/dynar.h
+	include/xbt/dict.h
+	include/xbt/set.h
+	include/xbt/heap.h
+	include/xbt/graph.h
+	include/xbt/fifo.h
+	include/xbt/swag.h
+	include/xbt/matrix.h
+	include/xbt/peer.h
+	include/xbt/config.h
+	include/xbt/cunit.h
+	include/xbt/graphxml_parse.h
+	include/xbt/graphxml.h
+	include/xbt/time.h
+	include/xbt/synchro.h
+	include/xbt/synchro_core.h
+	include/xbt/queue.h
+	include/xbt/setset.h
+	include/xbt/mmalloc.h
+	include/mc/modelchecker.h
+	include/msg/msg.h
+	include/msg/datatypes.h
+	include/simdag/simdag.h
+	include/simdag/datatypes.h
+	include/smpi/smpi.h
+	include/smpi/smpif.h
+	include/smpi/mpi.h
+	include/smpi/mpif.h
+	include/surf/surfxml_parse.h
+	include/surf/simgrid_dtd.h
+	include/gras/datadesc.h
+	include/gras/transport.h
+	include/gras/virtu.h
+	include/gras/emul.h
+	include/gras/process.h
+	include/gras/module.h
+	include/gras/messages.h
+	include/gras/timer.h
+	include/amok/peermanagement.h
+	include/amok/bandwidth.h
+	include/instr/instr.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
+	include/gras.h 
+	include/xbt.h
 )
 
 set(TEST_UNITS
-${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/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
 )
 
 set(TEST_CFILES
-src/xbt/cunit.c
-src/xbt/ex.c
-src/xbt/dynar.c
-src/xbt/dict.c
-src/xbt/set.c
-src/xbt/swag.c
-src/xbt/xbt_str.c
-src/xbt/xbt_strbuff.c
-src/xbt/xbt_sha.c
-src/xbt/config.c
-src/xbt/xbt_synchro.c
+	src/xbt/cunit.c
+	src/xbt/ex.c
+	src/xbt/dynar.c
+	src/xbt/dict.c
+	src/xbt/set.c
+	src/xbt/swag.c
+	src/xbt/xbt_str.c
+	src/xbt/xbt_strbuff.c
+	src/xbt/xbt_sha.c
+	src/xbt/config.c
+	src/xbt/xbt_synchro.c
 )
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
-if(${CONTEXT_THREADS} OR WIN32)
+if(${CONTEXT_THREADS}) #pthread
 	set(SURF_SRC
 		${SURF_SRC}
 		src/xbt/xbt_os_thread.c
@@ -453,17 +459,27 @@ if(${CONTEXT_THREADS} OR WIN32)
 		${EXTRA_DIST}
 		src/simix/smx_context_sysv.c
 	)
-else(${CONTEXT_THREADS} OR WIN32)
+else(${CONTEXT_THREADS}) #ucontext
 	set(SURF_SRC
 		${SURF_SRC}
 		src/simix/smx_context_sysv.c
 	)
-	set(EXTRA_DIST
-		${EXTRA_DIST}
-		src/xbt/xbt_os_thread.c
-		src/simix/smx_context_thread.c
-	)
-endif(${CONTEXT_THREADS} OR WIN32)
+
+	if(WIN32)
+    	set(SURF_SRC
+    		${SURF_SRC}
+    		src/xbt/xbt_os_thread.c
+    		src/simix/smx_context_thread.c)
+    else(WIN32)
+    	set(EXTRA_DIST
+    		${EXTRA_DIST}
+    		src/xbt/xbt_os_thread.c
+    		src/simix/smx_context_thread.c)
+    endif(WIN32)
+endif(${CONTEXT_THREADS})
+
+
+
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -478,10 +494,6 @@ else(HAVE_GTNETS)
 	)
 endif(HAVE_GTNETS)
 
-set(EXTRA_DIST
-	${EXTRA_DIST}
-	${JMSG_JAVA_SRC}
-)
 
 ### Simgrid Lib sources
 set(simgrid_sources
@@ -524,6 +536,10 @@ elseif(${HAVE_LUA})
 	)
 endif(${HAVE_LUA})
 
+set(EXTRA_DIST
+	${EXTRA_DIST}
+	${JMSG_JAVA_SRC}
+)
 if(${HAVE_JAVA})
 	set(simgrid_sources
 		${simgrid_sources}
@@ -582,22 +598,28 @@ file(GLOB_RECURSE add_src_files
 "teshsuite/*.cxx"
 "testsuite/*.c"
 "testsuite/*.cxx"
+"testsuite/*CMakeLists.txt"
 "tools/*.c"
 "tools/*.cxx"
+"tools/*CMakeLists.txt"
 "examples/*.c"
 "examples/*.cxx"
 "examples/*.java"
 "examples/*.lua"
 "examples/*.rb"
+"examples/*CMakeLists.txt"
 "src/bindings/*.lua"
 "src/bindings/*.rb"
 "src/bindings/*.c"
 "src/bindings/*.h"
-"*CMakeLists.txt"
+"src/bindings/*CMakeLists.txt"
 )
 set(add_src_files
 	${add_src_files}
+        CMakeLists.txt
 	src/smpi/smpicc.in
+	src/smpi/smpif2c.in
+	src/smpi/smpiff.in
 	src/smpi/smpirun.in
 	src/simix/smx_context_sysv_private.h
 	src/simgrid_units_main.c
@@ -705,11 +727,13 @@ file(GLOB_RECURSE txt_files
 "examples/java/comm_time/CommTimeTest"
 "examples/java/suspend/SuspendTest"
 )
+
 set(txt_files
 	${txt_files}
 	AUTHORS
 	ChangeLog
 	COPYING
+	LICENSE-LGPL-2.1
 	missing
 	NEWS
 	README
@@ -731,10 +755,8 @@ file(GLOB_RECURSE CMAKE_SOURCE_FILES
 
 set(bin_files
 tools/MSG_visualization/colorize.pl
-)
-
-file(GLOB_RECURSE doc_files
-"doc/html/*"
+tools/sg_unit_extractor.pl
+tools/simgrid_update_xml.pl
 )
 
 # This is the complete lise of what will be added to the source archive
@@ -767,5 +789,4 @@ set(source_to_pack
 	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
-	${doc_files}
 )