X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7721f9d25945759e012f67181e69550a3a222eb0..5b83d17d87eb4b7a182abd0e40512ad6811bdcc5:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 3e6b61e5d8..e9f76d770b 100755
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -195,9 +195,15 @@ set(XBT_SRC
 	src/xbt/cunit.c
 	src/xbt/graphxml_parse.c
 	src/xbt/setset.c
-	src/xbt/mmalloc/mm.c
 )
 
+if(HAVE_MMAP)
+	set(XBT_SRC
+	${XBT_SRC}
+	src/xbt/mmalloc/mm.c	
+	)
+endif(HAVE_MMAP)
+
 set(GTNETS_SRC 
 	src/surf/gtnets/gtnets_simulator.cc
 	src/surf/gtnets/gtnets_topology.cc
@@ -262,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
@@ -342,11 +355,7 @@ set(MC_SRC
 	src/mc/private.h
 )
 
-
 set(install_HEADERS
-include/gras.h 
-include/xbt.h
-include/simgrid_config.h
 include/xbt/misc.h
 include/xbt/sysdep.h
 include/xbt/virtu.h
@@ -398,21 +407,23 @@ 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
 )
 
 set(TEST_UNITS
-cunit_unit.c
-ex_unit.c
-dynar_unit.c
-dict_unit.c
-set_unit.c
-swag_unit.c
-xbt_str_unit.c
-xbt_strbuff_unit.c
-xbt_sha_unit.c
-config_unit.c
-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
@@ -429,33 +440,9 @@ src/xbt/config.c
 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
-${TEST_CFILES}
-)
-
 ### 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
@@ -465,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
@@ -475,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)
@@ -507,9 +494,15 @@ set(simgrid_sources
 	${GRAS_COMMON_SRC}
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
-	${MC_SRC}
 )
 
+if(HAVE_MC)
+	set(simgrid_sources
+		${simgrid_sources}
+		${MC_SRC}
+		)
+endif(HAVE_MC)
+
 ### Gras Lib sources
 set(gras_sources
 	${XBT_SRC}
@@ -726,44 +719,37 @@ set(source_to_pack
 	${txt_files}
 	${TEST_CFILES}
 	${EXTRA_DIST}
-	
 	CMakeLists.txt
-	buildtools/Cmake/src/CTestConfig.cmake
-	buildtools/Cmake/src/CTestTestfile.cmake
-	# FIXME: these should be renamed to .cmake, I guess
-	buildtools/Cmake/src/CMakeCompleteInFiles.txt
-	buildtools/Cmake/src/CMakeDefinePackages.txt
-	buildtools/Cmake/src/CMakeDistrib.txt
-	buildtools/Cmake/src/CMakeDocs.txt
-	buildtools/Cmake/src/CMakeFlags.txt
-	buildtools/Cmake/src/CMakeJarAndClass.txt
-	buildtools/Cmake/src/CMakeMaintainerMode.txt
-	buildtools/Cmake/src/CMakeMakeExeLib.txt
-	buildtools/Cmake/src/CMakeOption.txt
-	buildtools/Cmake/src/CMakePrintArgs.txt
-	buildtools/Cmake/src/CMakeSupernovae.txt
-	buildtools/Cmake/src/CMakeTest.txt
-	buildtools/Cmake/src/memcheck_tests.txt
-	# FIXME: these should live in src/ and the content of src in root of Cmake/ maybe
-	buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
-	buildtools/Cmake/prog_test/prog_getline.c
-	buildtools/Cmake/prog_test/prog_GRAS_ARCH.c
-	buildtools/Cmake/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-	buildtools/Cmake/prog_test/prog_gtnets.cpp
-	buildtools/Cmake/prog_test/prog_max_size.c
-	buildtools/Cmake/prog_test/prog_mutex_timedlock.c
-	buildtools/Cmake/prog_test/prog_printf_null.c
-	buildtools/Cmake/prog_test/prog_sem_init.c
-	buildtools/Cmake/prog_test/prog_sem_timedwait.c
-	buildtools/Cmake/prog_test/prog_snprintf.c
-	buildtools/Cmake/prog_test/prog_stackgrowth.c
-	buildtools/Cmake/prog_test/prog_stacksetup.c
-	buildtools/Cmake/prog_test/prog_va_copy.c
-	buildtools/Cmake/prog_test/prog_vsnprintf.c
-	# FIXME: these are badly named and placed
-	buildtools/Cmake/src/c_gras_config.h.in
-	buildtools/Cmake/src/tracing_config.h.in
-	
+	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
 	AUTHORS
 	ChangeLog
 	COPYING
@@ -812,19 +798,3 @@ set(source_to_pack
 	src/bindings/rubyDag/rb_simdag.c
 	src/bindings/rubyDag/simdag.rb
 )
-#set(script_to_install
-#	src/smpi/smpicc
-#	src/smpi/smpirun
-#	tools/MSG_visualization/colorize.pl
-#)
-#	tools/sg_unit_extractor.pl
-#	tools/doxygen/index_create.pl
-#	tools/doxygen/toc_create.pl
-#	tools/doxygen/index_php.pl
-#	tools/doxygen/doxygen_postprocesser.pl
-#	tools/doxygen/bibtex2html_table_count.pl
-#	tools/doxygen/bibtex2html_postprocessor.pl
-#	tools/doxygen/xbt_log_extract_hierarchy.pl
-#	tools/MSG_visualization/trace2fig.pl
-
-#message("\n\ntesh:\n${txt_files}")