A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put ns3 sources in place.
[simgrid.git]
/
buildtools
/
Cmake
/
DefinePackages.cmake
diff --git
a/buildtools/Cmake/DefinePackages.cmake
b/buildtools/Cmake/DefinePackages.cmake
index
c485b48
..
db5d97f
100644
(file)
--- a/
buildtools/Cmake/DefinePackages.cmake
+++ b/
buildtools/Cmake/DefinePackages.cmake
@@
-49,6
+49,7
@@
set(EXTRA_DIST
src/surf/gtnets/gtnets_simulator.h
src/surf/gtnets/gtnets_topology.h
src/surf/cpu_ti_private.h
src/surf/gtnets/gtnets_simulator.h
src/surf/gtnets/gtnets_topology.h
src/surf/cpu_ti_private.h
+ src/surf/surf_routing_private.h
src/include/surf/surf_resource.h
src/include/surf/datatypes.h
src/include/surf/maxmin.h
src/include/surf/surf_resource.h
src/include/surf/datatypes.h
src/include/surf/maxmin.h
@@
-166,6
+167,7
@@
set(XBT_SRC
src/xbt/setset.c
src/xbt/parmap.c
src/xbt/xbt_replay_trace_reader.c
src/xbt/setset.c
src/xbt/parmap.c
src/xbt/xbt_replay_trace_reader.c
+ src/xbt/lib.c
)
if(HAVE_MMAP)
)
if(HAVE_MMAP)
@@
-182,10
+184,20
@@
set(GTNETS_SRC
src/surf/network_gtnets.c
)
src/surf/network_gtnets.c
)
+set(NS3_SRC
+ src/surf/network_ns3.c
+ src/surf/ns3/ns3_interface.cc
+ )
+
set(SURF_SRC
src/surf/surf_model.c
src/surf/surf_action.c
src/surf/surf_routing.c
set(SURF_SRC
src/surf/surf_model.c
src/surf/surf_action.c
src/surf/surf_routing.c
+ src/surf/surf_routing_full.c
+ src/surf/surf_routing_floyd.c
+ src/surf/surf_routing_rulebased.c
+ src/surf/surf_routing_dijkstra.c
+ src/surf/surf_routing_none.c
src/surf/surf_config.c
src/surf/maxmin.c
src/surf/fair_bottleneck.c
src/surf/surf_config.c
src/surf/maxmin.c
src/surf/fair_bottleneck.c
@@
-448,7
+460,6
@@
else(HAVE_GTNETS)
)
endif(HAVE_GTNETS)
)
endif(HAVE_GTNETS)
-
### Simgrid Lib sources
set(simgrid_sources
${XBT_SRC}
### Simgrid Lib sources
set(simgrid_sources
${XBT_SRC}
@@
-472,6
+483,23
@@
if(HAVE_MC)
)
endif(HAVE_MC)
)
endif(HAVE_MC)
+if(HAVE_NS3)
+ set(simgrid_sources
+ ${simgrid_sources}
+ ${NS3_SRC}
+ )
+endif(HAVE_NS3)
+
+# WINDOWS
+if(WIN32)
+ set(simgrid_sources
+ ${simgrid_sources}
+ src/xbt/win32_ucontext.c
+ src/xbt/xbt_os_thread.c
+ src/simix/smx_context_thread.c
+ )
+endif(WIN32)
+
### Gras Lib sources
set(gras_sources
${XBT_SRC}
### Gras Lib sources
set(gras_sources
${XBT_SRC}
@@
-506,11
+534,12
@@
file(GLOB_RECURSE examples_to_install_in_doc
set(DOC_SOURCES
doc/contrib.doc
set(DOC_SOURCES
doc/contrib.doc
- doc/FAQ.doc
+
doc/FAQ.doc
doc/gtut-howto-design.doc
doc/gtut-howto.doc
doc/gtut-introduction.doc
doc/gtut-main.doc
doc/gtut-howto-design.doc
doc/gtut-howto.doc
doc/gtut-introduction.doc
doc/gtut-main.doc
+ doc/gtut-tour-00-install.doc
doc/gtut-tour-01-bones.doc
doc/gtut-tour-02-simple.doc
doc/gtut-tour-03-args.doc
doc/gtut-tour-01-bones.doc
doc/gtut-tour-02-simple.doc
doc/gtut-tour-03-args.doc
@@
-530,7
+559,7
@@
set(DOC_SOURCES
doc/gtut-tour.doc
doc/gtut-tour-recap-messages.doc
doc/history.doc
doc/gtut-tour.doc
doc/gtut-tour-recap-messages.doc
doc/history.doc
- doc/index-API.doc
+
#
doc/index-API.doc
doc/index.doc
doc/module-amok.doc
doc/module-gras.doc
doc/index.doc
doc/module-amok.doc
doc/module-gras.doc
@@
-584,6
+613,9
@@
set(DOC_SOURCES
doc/webcruft/robots.txt
doc/webcruft/simgrid_logo.png
doc/webcruft/simgrid_logo_small.png
doc/webcruft/robots.txt
doc/webcruft/simgrid_logo.png
doc/webcruft/simgrid_logo_small.png
+ doc/triva-graph_configuration.png
+ doc/triva-graph_visualization.png
+ doc/simgrid.css
doc/Doxyfile.in
doc/footer.html.in
doc/Doxyfile.in
doc/footer.html.in
@@
-606,6
+638,10
@@
set(DOC_FIGS
${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
)
${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
)
+set(DOC_bib
+ ${CMAKE_HOME_DIRECTORY}/doc/all.bib
+)
+
file(GLOB_RECURSE add_src_files
"teshsuite/*.c"
"teshsuite/*.cxx"
file(GLOB_RECURSE add_src_files
"teshsuite/*.c"
"teshsuite/*.cxx"
@@
-703,6
+739,7
@@
set(txt_files
"teshsuite/gras/small_sleep/test_sg_64.tesh"
"teshsuite/simdag/platforms/bob.fail"
"teshsuite/simdag/platforms/bob.trace"
"teshsuite/gras/small_sleep/test_sg_64.tesh"
"teshsuite/simdag/platforms/bob.fail"
"teshsuite/simdag/platforms/bob.trace"
+"teshsuite/simdag/platforms/bob0_availability_file.trace"
"teshsuite/simdag/platforms/link1.bw"
"teshsuite/simdag/platforms/link1.fail"
"teshsuite/simdag/platforms/link1.lat"
"teshsuite/simdag/platforms/link1.bw"
"teshsuite/simdag/platforms/link1.fail"
"teshsuite/simdag/platforms/link1.lat"
@@
-759,6
+796,7
@@
file(GLOB_RECURSE README_files
string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
file(GLOB_RECURSE CMAKE_SOURCE_FILES
string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/Makefile.default"
"buildtools/Cmake/test_java.sh"
"buildtools/Cmake/*.cmake"
"buildtools/Cmake/*.h.in"
"buildtools/Cmake/test_java.sh"
"buildtools/Cmake/*.cmake"
"buildtools/Cmake/*.h.in"
@@
-775,8
+813,9
@@
tools/simgrid_update_xml.pl
buildtools/Cmake/tesh.pl
)
buildtools/Cmake/tesh.pl
)
-# This is the complete lis
e
of what will be added to the source archive
+# This is the complete lis
t
of what will be added to the source archive
set(source_to_pack
set(source_to_pack
+ ${install_HEADERS}
${XBT_RL_SRC}
${EXTRA_DIST}
${SMPI_SRC}
${XBT_RL_SRC}
${EXTRA_DIST}
${SMPI_SRC}
@@
-800,10
+839,10
@@
set(source_to_pack
${xml_files}
${tesh_files}
${txt_files}
${xml_files}
${tesh_files}
${txt_files}
- ${EXTRA_DIST}
${CMAKE_SOURCE_FILES}
${bin_files}
${DOC_SOURCES}
${DOC_FIGS}
${CMAKE_SOURCE_FILES}
${bin_files}
${DOC_SOURCES}
${DOC_FIGS}
+ ${DOC_bib}
${README_files}
)
${README_files}
)