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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2ea763a927..e9f76d770b 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
@@ -400,7 +407,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
@@ -421,45 +427,22 @@ ${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c
 )
 
 set(TEST_CFILES
-${PROJECT_DIRECTORY}/src/xbt/cunit.c
-${PROJECT_DIRECTORY}/src/xbt/ex.c
-${PROJECT_DIRECTORY}/src/xbt/dynar.c
-${PROJECT_DIRECTORY}/src/xbt/dict.c
-${PROJECT_DIRECTORY}/src/xbt/set.c
-${PROJECT_DIRECTORY}/src/xbt/swag.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_str.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_strbuff.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_sha.c
-${PROJECT_DIRECTORY}/src/xbt/config.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_synchro.c
-)
-
-#Here must have all files which permit to generate source files
-set(SRC_TO_LOOK
-src/surf/simgrid.dtd
-src/xbt/graphxml.dtd
-src/simdag/dax.dtd
-examples/gras/ping/ping.xml
-examples/gras/rpc/rpc.xml
-examples/gras/spawn/spawn.xml
-examples/gras/timer/timer.xml
-examples/gras/chrono/chrono.xml
-examples/gras/mutual_exclusion/simple_token/simple_token.xml
-examples/gras/mmrpc/mmrpc.xml
-examples/gras/all2all/all2all.xml
-examples/gras/pmm/pmm.xml
-examples/gras/synchro/synchro.xml
-examples/gras/properties/properties.xml
-teshsuite/gras/msg_handle/msg_handle.xml
-teshsuite/gras/empty_main/empty_main.xml
-teshsuite/gras/small_sleep/small_sleep.xml
-examples/amok/bandwidth/bandwidth.xml
-examples/amok/saturate/saturate.xml
+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})
+if(${CONTEXT_THREADS} OR WIN32)
 	set(SURF_SRC
 		${SURF_SRC}
 		src/xbt/xbt_os_thread.c
@@ -469,7 +452,7 @@ if(${CONTEXT_THREADS})
 		${EXTRA_DIST}
 		src/simix/smx_context_sysv.c
 	)
-else(${CONTEXT_THREADS})
+else(${CONTEXT_THREADS} OR WIN32)
 	set(SURF_SRC
 		${SURF_SRC}
 		src/simix/smx_context_sysv.c
@@ -479,7 +462,7 @@ else(${CONTEXT_THREADS})
 		src/xbt/xbt_os_thread.c
 		src/simix/smx_context_thread.c
 	)
-endif(${CONTEXT_THREADS})
+endif(${CONTEXT_THREADS} OR WIN32)
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -513,12 +496,12 @@ set(simgrid_sources
 	${AMOK_SRC}
 )
 
-if(enable_model-checking AND HAVE_MMAP)
+if(HAVE_MC)
 	set(simgrid_sources
-		${simgrid_source}
+		${simgrid_sources}
 		${MC_SRC}
 		)
-endif(enable_model-checking AND HAVE_MMAP)
+endif(HAVE_MC)
 
 ### Gras Lib sources
 set(gras_sources
@@ -767,7 +750,6 @@ set(source_to_pack
 	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