X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81582ff1ff2a61ab0a5a98a01174b7ba522d7414..23d1de2a773c69fda37d5d1c3e3a8ea72e0dd523:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 4bc1faace3..be59f80970 100755
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -240,9 +240,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
@@ -321,10 +321,13 @@ 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,7 +336,10 @@ 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
 )
 
@@ -443,7 +449,7 @@ 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)
@@ -729,6 +745,10 @@ file(GLOB_RECURSE CMAKE_SOURCE_FILES
 "buildtools/Cmake/test_prog/*.cpp"
 )
 
+set(bin_files
+tools/MSG_visualization/colorize.pl
+)
+
 # This is the complete lise of what will be added to the source archive
 set(source_to_pack	
 	${XBT_RL_SRC}
@@ -758,4 +778,5 @@ set(source_to_pack
 	${TEST_CFILES}
 	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
+	${bin_files}
 )