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
MC: rename remote/Client into remote/AppSide
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index
15812e4
..
94738af
100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-293,7
+293,6
@@
set(XBT_SRC
src/xbt/xbt_log_layout_simple.cpp
src/xbt/xbt_main.cpp
src/xbt/xbt_os_file.cpp
src/xbt/xbt_log_layout_simple.cpp
src/xbt/xbt_main.cpp
src/xbt/xbt_os_file.cpp
- src/xbt/xbt_os_synchro.cpp
src/xbt/xbt_os_time.c
src/xbt/xbt_replay.cpp
src/xbt/xbt_str.cpp
src/xbt/xbt_os_time.c
src/xbt/xbt_replay.cpp
src/xbt/xbt_str.cpp
@@
-566,7
+565,6
@@
set(TRACING_SRC
src/instr/instr_paje_trace.cpp
src/instr/instr_paje_types.cpp
src/instr/instr_paje_types.hpp
src/instr/instr_paje_trace.cpp
src/instr/instr_paje_types.cpp
src/instr/instr_paje_types.hpp
- src/instr/instr_paje_values.cpp
src/instr/instr_paje_values.hpp
src/instr/instr_platform.cpp
src/instr/instr_private.hpp
src/instr/instr_paje_values.hpp
src/instr/instr_platform.cpp
src/instr/instr_private.hpp
@@
-628,8
+626,10
@@
set(MC_SRC
src/mc/remote/Channel.cpp
src/mc/remote/Channel.hpp
src/mc/remote/Channel.cpp
src/mc/remote/Channel.hpp
- src/mc/remote/Client.cpp
- src/mc/remote/Client.hpp
+ src/mc/remote/AppSide.cpp
+ src/mc/remote/AppSide.hpp
+ src/mc/remote/EventLoop.cpp
+ src/mc/remote/EventLoop.hpp
src/mc/remote/RemoteClient.hpp
src/mc/remote/RemoteClient.cpp
src/mc/remote/RemotePtr.hpp
src/mc/remote/RemoteClient.hpp
src/mc/remote/RemoteClient.cpp
src/mc/remote/RemotePtr.hpp
@@
-658,7
+658,6
@@
set(MC_SRC
src/mc/mc_hash.cpp
src/mc/mc_ignore.hpp
src/mc/mc_record.cpp
src/mc/mc_hash.cpp
src/mc/mc_ignore.hpp
src/mc/mc_record.cpp
- src/mc/mc_memory.cpp
src/mc/mc_private.hpp
src/mc/mc_request.hpp
src/mc/mc_request.cpp
src/mc/mc_private.hpp
src/mc/mc_request.hpp
src/mc/mc_request.cpp
@@
-679,7
+678,9
@@
set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp)
set(headers_to_install
include/simgrid/actor.h
include/simgrid/barrier.h
set(headers_to_install
include/simgrid/actor.h
include/simgrid/barrier.h
+ include/simgrid/comm.h
include/simgrid/engine.h
include/simgrid/engine.h
+ include/simgrid/exec.h
include/simgrid/Exception.hpp
include/simgrid/chrono.hpp
include/simgrid/plugins/dvfs.h
include/simgrid/Exception.hpp
include/simgrid/chrono.hpp
include/simgrid/plugins/dvfs.h
@@
-691,7
+692,6
@@
set(headers_to_install
include/simgrid/smpi/replay.hpp
include/simgrid/instr.h
include/simgrid/mailbox.h
include/simgrid/smpi/replay.hpp
include/simgrid/instr.h
include/simgrid/mailbox.h
- include/simgrid/msg.h
include/simgrid/simdag.h
include/simgrid/modelchecker.h
include/simgrid/forward.h
include/simgrid/simdag.h
include/simgrid/modelchecker.h
include/simgrid/forward.h
@@
-699,6
+699,7
@@
set(headers_to_install
include/simgrid/simix.hpp
include/simgrid/simix/blocking_simcall.hpp
include/simgrid/kernel/future.hpp
include/simgrid/simix.hpp
include/simgrid/simix/blocking_simcall.hpp
include/simgrid/kernel/future.hpp
+ include/simgrid/disk.h
include/simgrid/host.h
include/simgrid/link.h
include/simgrid/cond.h
include/simgrid/host.h
include/simgrid/link.h
include/simgrid/cond.h
@@
-815,10
+816,17
@@
set(simgrid_sources
${XBT_SRC}
${PLUGINS_SRC}
${BINDINGS_SRC}
${XBT_SRC}
${PLUGINS_SRC}
${BINDINGS_SRC}
- ${MSG_SRC}
${SIMDAG_SRC}
)
${SIMDAG_SRC}
)
+if(${enable_msg})
+ set(headers_to_install ${headers_to_install} include/simgrid/msg.h)
+ set(simgrid_sources ${simgrid_sources} ${MSG_SRC})
+else()
+ set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/msg.h
+ ${MSG_SRC})
+endif()
+
if(${SIMGRID_HAVE_JEDULE})
set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC})
else()
if(${SIMGRID_HAVE_JEDULE})
set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC})
else()
@@
-885,6
+893,7
@@
set(DOC_SOURCES
docs/source/_ext/showfile.css
docs/source/_ext/showfile.js
docs/source/_ext/showfile.py
docs/source/_ext/showfile.css
docs/source/_ext/showfile.js
docs/source/_ext/showfile.py
+ docs/source/_static/css/custom.css
docs/source/_templates/breadcrumbs.html
docs/source/img/eclipseScreenShot.png
docs/source/_templates/breadcrumbs.html
docs/source/img/eclipseScreenShot.png
@@
-996,10
+1005,11
@@
set(txt_files
# The list of cmake build directories is constructed from the following list.
# Add your CMakeLists file here to see your subdir built.
set(CMAKEFILES_TXT
# The list of cmake build directories is constructed from the following list.
# Add your CMakeLists file here to see your subdir built.
set(CMAKEFILES_TXT
+ examples/c/CMakeLists.txt
examples/s4u/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/smpi/NAS/CMakeLists.txt
examples/s4u/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/smpi/NAS/CMakeLists.txt
- examples/smpi/smpi_
msg
_masterslave/CMakeLists.txt
+ examples/smpi/smpi_
s4u
_masterslave/CMakeLists.txt
examples/smpi/replay_multiple/CMakeLists.txt
examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
examples/python/CMakeLists.txt
examples/smpi/replay_multiple/CMakeLists.txt
examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
examples/python/CMakeLists.txt
@@
-1009,9
+1019,11
@@
set(CMAKEFILES_TXT
examples/deprecated/simdag/CMakeLists.txt
teshsuite/java/CMakeLists.txt
examples/deprecated/simdag/CMakeLists.txt
teshsuite/java/CMakeLists.txt
+ teshsuite/kernel/CMakeLists.txt
teshsuite/lua/CMakeLists.txt
teshsuite/mc/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
teshsuite/lua/CMakeLists.txt
teshsuite/mc/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
+ teshsuite/python/CMakeLists.txt
teshsuite/s4u/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simix/CMakeLists.txt
teshsuite/s4u/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simix/CMakeLists.txt
@@
-1127,6
+1139,7
@@
set(PLATFORMS_EXAMPLES
examples/platforms/optorsim/transform_optorsim_platform.pl
examples/platforms/config.xml
examples/platforms/config_tracing.xml
examples/platforms/optorsim/transform_optorsim_platform.pl
examples/platforms/config.xml
examples/platforms/config_tracing.xml
+ examples/platforms/model_checker_platform.xml
examples/platforms/profiles/bourassa_state.profile
examples/platforms/profiles/fafard_state.profile
examples/platforms/profiles/faulty_host.profile
examples/platforms/profiles/bourassa_state.profile
examples/platforms/profiles/fafard_state.profile
examples/platforms/profiles/faulty_host.profile
@@
-1159,7
+1172,6
@@
set(PLATFORMS_EXAMPLES
examples/platforms/simulacrum_7_hosts.xml
examples/platforms/storage/content/small_content.txt
examples/platforms/storage/content/storage_content.txt
examples/platforms/simulacrum_7_hosts.xml
examples/platforms/storage/content/small_content.txt
examples/platforms/storage/content/storage_content.txt
- examples/platforms/storage/remote_io.xml
examples/platforms/storage/storage.xml
examples/platforms/small_platform.xml
examples/platforms/small_platform.lua
examples/platforms/storage/storage.xml
examples/platforms/small_platform.xml
examples/platforms/small_platform.lua
@@
-1180,6
+1192,7
@@
set(PLATFORMS_EXAMPLES
examples/platforms/two_hosts_platform_with_availability_included.xml
examples/platforms/two_peers.xml
examples/platforms/vivaldi.xml
examples/platforms/two_hosts_platform_with_availability_included.xml
examples/platforms/two_peers.xml
examples/platforms/vivaldi.xml
+ examples/platforms/wifi_decay_2STA.xml
examples/platforms/wifi.xml
)
examples/platforms/wifi.xml
)