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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index cb41d4dc89..d429fef4c5 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
@@ -342,11 +348,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
@@ -399,34 +401,37 @@ 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
-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
+${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
@@ -450,7 +455,6 @@ 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
@@ -507,9 +511,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,7 +736,6 @@ set(source_to_pack
 	${txt_files}
 	${TEST_CFILES}
 	${EXTRA_DIST}
-	
 	CMakeLists.txt
 	buildtools/Cmake/CTestConfig.cmake
 	buildtools/Cmake/CompleteInFiles.cmake
@@ -742,7 +751,6 @@ set(source_to_pack
 	buildtools/Cmake/Supernovae.cmake
 	buildtools/Cmake/AddTests.cmake
 	buildtools/Cmake/memcheck_tests.cmake
-	# FIXME: these should live in src/ and the content of src in root of Cmake/ maybe
 	buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
 	buildtools/Cmake/test_prog/prog_getline.c
 	buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
@@ -758,10 +766,8 @@ set(source_to_pack
 	buildtools/Cmake/test_prog/prog_stacksetup.c
 	buildtools/Cmake/test_prog/prog_va_copy.c
 	buildtools/Cmake/test_prog/prog_vsnprintf.c
-	# FIXME: these are badly named and placed
 	buildtools/Cmake/gras_config.h.in
 	buildtools/Cmake/tracing_config.h.in
-	
 	AUTHORS
 	ChangeLog
 	COPYING
@@ -810,19 +816,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}")