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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8e4a66eb68..fa0d054941 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -269,14 +269,11 @@ set(SIMDAG_SRC
 	src/simdag/sd_workstation.c
 	src/simdag/sd_daxloader.c
 )
-if(enable_graphviz AND HAVE_CDT_LIB)
-if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+if(HAVE_GRAPHVIZ)
 	set(SIMDAG_SRC 
-	    ${SIMDAG_SRC}
-		src/simdag/sd_dotloader.c
+	    ${SIMDAG_SRC} src/simdag/sd_dotloader.c
 	)
-endif(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-endif(enable_graphviz AND HAVE_CDT_LIB)
+endif(HAVE_GRAPHVIZ)
 
 set(GRAS_COMMON_SRC
 	src/gras/gras.c
@@ -345,11 +342,11 @@ set(TRACING_SRC
 )
 
 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
@@ -364,90 +361,90 @@ 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/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
+	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
@@ -497,10 +494,6 @@ else(HAVE_GTNETS)
 	)
 endif(HAVE_GTNETS)
 
-set(EXTRA_DIST
-	${EXTRA_DIST}
-	${JMSG_JAVA_SRC}
-)
 
 ### Simgrid Lib sources
 set(simgrid_sources
@@ -543,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}
@@ -601,21 +598,25 @@ 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
@@ -726,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