X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec88f2673eca058368a71544feb4d5d0a4d7dc98..8566507c07e0ad81c282021b1269e61c5ff13729:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b292192068..a1a26fa29f 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -10,6 +10,7 @@ set(EXTRA_DIST src/mc/mc_record.h src/include/simgrid/sg_config.h src/include/smpi/smpi_interface.h + src/include/smpi/smpi_utils.hpp src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/surf.h @@ -79,7 +80,6 @@ set(EXTRA_DIST src/surf/surf_interface.hpp src/surf/surf_private.h src/surf/surf_routing.hpp - src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp src/surf/virtual_machine.hpp src/surf/host_clm03.hpp @@ -115,6 +115,9 @@ set(EXTRA_DIST teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh + + examples/java/.classpath + examples/java/.project ) set(SMPI_SRC @@ -237,7 +240,11 @@ set(SMPI_SRC src/smpi/smpi_replay.cpp src/smpi/smpi_rma.cpp src/smpi/smpi_topo.cpp + src/smpi/smpi_utils.cpp src/smpi/smpi_f77.cpp + + src/surf/network_smpi.cpp + src/surf/network_ib.cpp ) set(XBT_SRC @@ -311,8 +318,6 @@ set(SURF_SRC src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp - src/surf/network_smpi.cpp - src/surf/network_ib.cpp src/surf/plugins/energy.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp @@ -327,7 +332,6 @@ set(SURF_SRC src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp - src/surf/vm_hl13.cpp src/surf/virtual_machine.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp @@ -415,15 +419,11 @@ set(MSG_SRC set(SIMDAG_SRC src/simdag/sd_daxloader.cpp + src/simdag/sd_dotloader.cpp src/simdag/sd_global.cpp src/simdag/sd_task.cpp src/simdag/sd_workstation.cpp ) -if(HAVE_GRAPHVIZ) - set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp) -else() - set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.cpp) -endif() set(BINDINGS_SRC src/bindings/lua/lua_private.h @@ -520,12 +520,12 @@ set(TRACING_SRC ) set(JEDULE_SRC - include/simgrid/jedule/jedule_events.h - include/simgrid/jedule/jedule_output.h - include/simgrid/jedule/jedule_platform.h + include/simgrid/jedule/jedule_events.hpp + include/simgrid/jedule/jedule.hpp + include/simgrid/jedule/jedule_platform.hpp include/simgrid/jedule/jedule_sd_binding.h src/instr/jedule/jedule_events.cpp - src/instr/jedule/jedule_output.cpp + src/instr/jedule/jedule.cpp src/instr/jedule/jedule_platform.cpp src/instr/jedule/jedule_sd_binding.cpp ) @@ -649,7 +649,7 @@ set(headers_to_install include/simgrid/s4u/engine.hpp include/simgrid/s4u/file.hpp include/simgrid/s4u/host.hpp - include/simgrid/s4u/mailbox.hpp + include/simgrid/s4u/Mailbox.hpp include/simgrid/s4u/Mutex.hpp include/simgrid/s4u/conditionVariable.hpp include/simgrid/s4u/storage.hpp @@ -703,7 +703,7 @@ set(headers_to_install include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h - include/xbt/synchro_core.h + include/xbt/synchro.h include/xbt/sysdep.h include/xbt/system_error.hpp include/xbt/utility.hpp @@ -845,12 +845,14 @@ set(DOC_SOURCES doc/doxygen/stylesheet.css doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc + doc/doxygen/uhood_arch.doc doc/manpage/smpicc.1 doc/manpage/smpicxx.1 doc/manpage/smpif90.1 doc/manpage/smpiff.1 doc/manpage/smpirun.1 + doc/manpage/tesh.pod doc/msg-tuto-src/deployment0.xml doc/msg-tuto-src/deployment1.xml @@ -914,8 +916,6 @@ set(txt_files AUTHORS COPYING README - README.java - README.lua ChangeLog INSTALL LICENSE-LGPL-2.1 @@ -997,7 +997,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Java.cmake tools/cmake/MakeLib.cmake tools/cmake/MakeLibWin.cmake - tools/cmake/Modules/FindGFortran.cmake tools/cmake/Modules/FindGraphviz.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibunwind.cmake @@ -1008,14 +1007,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/scripts/IPC/Run.pm - tools/cmake/scripts/IPC/Run/Debug.pm - tools/cmake/scripts/IPC/Run/IO.pm - tools/cmake/scripts/IPC/Run/Timer.pm - tools/cmake/scripts/IPC/Run/Win32Helper.pm - tools/cmake/scripts/IPC/Run/Win32IO.pm - tools/cmake/scripts/IPC/Run/Win32Pump.pm - tools/cmake/scripts/Diff.pm tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake