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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 97be594c30..4cc6409ab5 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -108,6 +108,7 @@ set(SMPI_SRC
 	src/smpi/smpi_global.c
 	src/smpi/smpi_mpi.c
 	src/smpi/smpi_pmpi.c
+	src/smpi/smpi_c99.c
 	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
@@ -302,6 +303,7 @@ set(TRACING_SRC
 	src/instr/instr_routing.c
 	src/instr/instr_config.c
 	src/instr/instr_interface.c
+	src/instr/instr_paje.c
 	src/instr/instr_paje_trace.c
 	src/instr/instr_msg_task.c
 	src/instr/instr_msg_process.c
@@ -314,6 +316,18 @@ set(TRACING_SRC
 	src/instr/instr_private.h
 )
 
+
+set(JEDULE_SRC
+	include/instr/jedule/jedule_events.h
+	include/instr/jedule/jedule_output.h
+	include/instr/jedule/jedule_platform.h
+	include/instr/jedule/jedule_sd_binding.h
+	src/instr/jedule/jedule_events.c
+	src/instr/jedule/jedule_output.c
+	src/instr/jedule/jedule_platform.c
+	src/instr/jedule/jedule_sd_binding.c
+)
+
 set(RUBY_SRC
 	src/simix/smx_context_ruby.c
 	src/bindings/ruby/rb_msg_process.c
@@ -333,6 +347,10 @@ set(MC_SRC
 	src/mc/private.h
 )
 
+set(RNGSTREAM_SRC
+	src/rngstreams/RngStream.c
+)
+
 set(install_HEADERS
 	include/xbt/misc.h
 	include/xbt/sysdep.h
@@ -373,7 +391,7 @@ set(install_HEADERS
 	include/simdag/simdag.h
 	include/simdag/datatypes.h
 	include/smpi/smpi.h
-	include/smpi/smpif.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
 	include/smpi/mpi.h
 	include/smpi/mpif.h
 	include/surf/surfxml_parse.h
@@ -397,6 +415,33 @@ set(install_HEADERS
 	include/simix/context.h
 )
 
+if(enable_java)
+set(install_HEADERS
+	${install_HEADERS}
+	#Those src files are necessary for binding java 
+	src/portable.h
+	src/msg/private.h
+	src/simix/private.h
+	src/msg/mailbox.h
+	src/include/surf/surf.h
+	src/instr/instr_private.h
+	src/include/surf/datatypes.h
+	src/include/surf/surf_resource_lmm.h
+	src/include/surf/surf_resource.h
+	src/simdag/private.h
+	src/xbt/ex_interface.h
+	src/simix/process_private.h
+	src/simix/host_private.h
+	src/simix/network_private.h
+	src/simix/smurf_private.h
+	src/simix/synchro_private.h
+	src/include/surf/trace_mgr.h
+	src/include/xbt/xbt_os_thread.h
+	src/include/surf/maxmin.h
+	include/xbt/swag.h
+	${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h)
+endif(enable_java)
+
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
 if(${CONTEXT_THREADS}) #pthread
@@ -451,6 +496,8 @@ set(simgrid_sources
 	${GRAS_COMMON_SRC}
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
+	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 )
 
 if(HAVE_MC)
@@ -500,22 +547,13 @@ file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.h"
 "examples/*.cxx"
 "examples/*.hpp"
-"examples/*.c"
 "examples/*.rb"
 "examples/*.lua"
 "examples/*.java"
 "examples/*.xml"
-)
-
-file(GLOB_RECURSE README_examples_files
 "examples/*README"
 )
 
-set(examples_to_install_in_doc
-${examples_to_install_in_doc}
-${README_examples_files}
-)
-
 set(DOC_SOURCES
 	doc/contrib.doc
     doc/FAQ.doc
@@ -618,20 +656,6 @@ set(DOC_FIGS
 	${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
-foreach(file ${examples_to_install_in_doc})
-	string(REGEX REPLACE "/[^/]*$" "" file "${file}")
-	set(new_examples_to_install_in_doc "${new_examples_to_install_in_doc}${file};")
-endforeach(file ${examples_to_install_in_doc})
-
-set(directory_to_create "")
-
-foreach(file ${new_examples_to_install_in_doc})
-	string(REGEX MATCH "${file};" OPERATION "${directory_to_create}")
-	if(NOT OPERATION)
-		set(directory_to_create "${directory_to_create}${file};")
-	endif(NOT OPERATION)
-endforeach(file ${new_examples_to_install_in_doc})
-
 file(GLOB_RECURSE add_src_files
 "teshsuite/*.c"
 "teshsuite/*.cxx"