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
C interface to Comm::wait_any_for
[simgrid.git]
/
tools
/
cmake
/
DefinePackages.cmake
diff --git
a/tools/cmake/DefinePackages.cmake
b/tools/cmake/DefinePackages.cmake
index 2511c87c98ef8c3b0b1ea58b2d1459354912559a..c88566afd5b0e723f3e89c20e80d1605c39bea9e 100644
(file)
--- a/
tools/cmake/DefinePackages.cmake
+++ b/
tools/cmake/DefinePackages.cmake
@@
-679,6
+679,7
@@
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/Exception.hpp
include/simgrid/chrono.hpp
include/simgrid/engine.h
include/simgrid/Exception.hpp
include/simgrid/chrono.hpp
@@
-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
@@
-815,10
+815,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()
@@
-999,7
+1006,7
@@
set(CMAKEFILES_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