Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index be8b4db..89b8c96 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/surf_routing_private.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/lib.c
 )
 
 if(HAVE_MMAP)
@@ -186,6 +188,11 @@ 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
@@ -292,6 +299,12 @@ set(AMOK_SRC
        src/amok/PeerManagement/peermanagement.c
 )
 
+set(LUA_SRC
+       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_routing.c
        src/instr/instr_config.c
@@ -442,7 +455,6 @@ else(HAVE_GTNETS)
        )
 endif(HAVE_GTNETS)
 
-
 ### Simgrid Lib sources
 set(simgrid_sources
        ${XBT_SRC}
@@ -466,6 +478,16 @@ if(HAVE_MC)
                )
 endif(HAVE_MC)
 
+# 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}
@@ -474,18 +496,33 @@ set(gras_sources
        ${AMOK_SRC}
 )
 
+if(${HAVE_LUA})
+       set(simgrid_sources
+               ${simgrid_sources}
+               ${LUA_SRC}
+       )
+elseif(${HAVE_LUA})
+       set(EXTRA_DIST
+               ${EXTRA_DIST}
+               ${LUA_SRC}
+       )
+endif(${HAVE_LUA})
+
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
 "examples/*.cxx"
 "examples/*.hpp"
+"examples/*.rb"
+"examples/*.lua"
+"examples/*.java"
 "examples/*.xml"
 "examples/*README"
 )
 
 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
@@ -509,7 +546,7 @@ set(DOC_SOURCES
        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
@@ -563,6 +600,9 @@ set(DOC_SOURCES
        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
@@ -585,6 +625,10 @@ set(DOC_FIGS
        ${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"
@@ -597,7 +641,11 @@ file(GLOB_RECURSE add_src_files
 "tools/*CMakeLists.txt"
 "examples/*.c"
 "examples/*.cxx"
+"examples/*.lua"
+"examples/*.rb"
 "examples/*CMakeLists.txt"
+"src/bindings/*.lua"
+"src/bindings/*.rb"
 "src/bindings/*.c"
 "src/bindings/*.h"
 "src/bindings/*CMakeLists.txt"
@@ -734,6 +782,7 @@ file(GLOB_RECURSE README_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"
@@ -766,6 +815,7 @@ set(source_to_pack
        ${GRAS_COMMON_SRC}
        ${GRAS_SG_SRC}
        ${AMOK_SRC}
+       ${LUA_SRC}
        ${MC_SRC}
        ${JEDULE_SRC}
        ${RNGSTREAM_SRC}
@@ -774,10 +824,10 @@ set(source_to_pack
        ${xml_files}
        ${tesh_files}
        ${txt_files}
-       ${EXTRA_DIST}
        ${CMAKE_SOURCE_FILES}
        ${bin_files}
        ${DOC_SOURCES}
        ${DOC_FIGS}
+       ${DOC_bib}
        ${README_files}
 )