X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6de5d3fc33ec47c1b0d97e24463de43dd4eb129..128ea0e762c5eb7cd5c5a4be1cb7f745592be979:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0bfcdae30b..b95d9cf067 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -81,7 +81,8 @@ set(EXTRA_DIST src/surf/surf_private.h src/surf/surf_routing.hpp src/surf/PropertyHolder.hpp - src/surf/virtual_machine.hpp + src/surf/VirtualMachineImpl.hpp + src/surf/VmHostExt.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -332,7 +333,8 @@ set(SURF_SRC src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp - src/surf/virtual_machine.cpp + src/surf/VirtualMachineImpl.cpp + src/surf/VmHostExt.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp @@ -391,6 +393,7 @@ set(S4U_SRC src/s4u/s4u_mutex.cpp src/s4u/s4u_conditionVariable.cpp src/s4u/s4u_storage.cpp + src/s4u/s4u_VirtualMachine.cpp ) set(SIMGRID_SRC @@ -419,15 +422,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 @@ -657,6 +656,7 @@ set(headers_to_install include/simgrid/s4u/Mutex.hpp include/simgrid/s4u/conditionVariable.hpp include/simgrid/s4u/storage.hpp + include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp include/simgrid/plugins/energy.h include/smpi/mpi.h @@ -707,7 +707,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 @@ -849,6 +849,7 @@ 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 @@ -1000,7 +1001,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