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
model-checker : initialize variables (compilation error with optimizations)
[simgrid.git]
/
buildtools
/
Cmake
/
DefinePackages.cmake
diff --git
a/buildtools/Cmake/DefinePackages.cmake
b/buildtools/Cmake/DefinePackages.cmake
index
7ce53ff
..
da375fb
100644
(file)
--- a/
buildtools/Cmake/DefinePackages.cmake
+++ b/
buildtools/Cmake/DefinePackages.cmake
@@
-126,7
+126,12
@@
if(SMPI_F2C)
${SMPI_SRC}
src/smpi/smpi_f77.c
)
${SMPI_SRC}
src/smpi/smpi_f77.c
)
-endif(SMPI_F2C)
+else()
+ set(EXTRA_DIST
+ ${EXTRA_DIST}
+ src/smpi/smpi_f77.c
+ )
+endif()
set(GRAS_RL_SRC
${XBT_RL_SRC}
set(GRAS_RL_SRC
${XBT_RL_SRC}
@@
-198,7
+203,7
@@
if(HAVE_MMAP)
${XBT_SRC}
src/xbt/mmalloc/mm.c
)
${XBT_SRC}
src/xbt/mmalloc/mm.c
)
-endif(
HAVE_MMAP
)
+endif()
set(GTNETS_SRC
src/surf/gtnets/gtnets_interface.cc
set(GTNETS_SRC
src/surf/gtnets/gtnets_interface.cc
@@
-320,11
+325,11
@@
if(HAVE_GRAPHVIZ)
set(SIMDAG_SRC
${SIMDAG_SRC} src/simdag/sd_dotloader.c
)
set(SIMDAG_SRC
${SIMDAG_SRC} src/simdag/sd_dotloader.c
)
-else(
HAVE_GRAPHVIZ
)
+else()
set(EXTRA_DIST
${EXTRA_DIST} src/simdag/sd_dotloader.c
)
set(EXTRA_DIST
${EXTRA_DIST} src/simdag/sd_dotloader.c
)
-endif(
HAVE_GRAPHVIZ
)
+endif()
set(GRAS_COMMON_SRC
src/gras/Msg/gras_msg_exchange.c
set(GRAS_COMMON_SRC
src/gras/Msg/gras_msg_exchange.c
@@
-419,7
+424,6
@@
set(MC_SRC
src/mc/mc_request.c
src/mc/mc_state.c
src/mc/memory_map.c
src/mc/mc_request.c
src/mc/mc_state.c
src/mc/memory_map.c
- src/mc/test/heap_comparison.c
)
set(headers_to_install
)
set(headers_to_install
@@
-504,38
+508,38
@@
if(${CONTEXT_THREADS}) #pthread
src/simix/smx_context_thread.c
src/xbt/xbt_os_thread.c
)
src/simix/smx_context_thread.c
src/xbt/xbt_os_thread.c
)
-else(
${CONTEXT_THREADS}
) # NOT pthread
+else() # NOT pthread
set(EXTRA_DIST
${EXTRA_DIST}
src/simix/smx_context_thread.c
src/xbt/xbt_os_thread.c
)
set(EXTRA_DIST
${EXTRA_DIST}
src/simix/smx_context_thread.c
src/xbt/xbt_os_thread.c
)
-endif(
${CONTEXT_THREADS}
)
+endif()
if(${CONTEXT_UCONTEXT}) #ucontext
set(SURF_SRC
${SURF_SRC}
src/simix/smx_context_sysv.c
)
if(${CONTEXT_UCONTEXT}) #ucontext
set(SURF_SRC
${SURF_SRC}
src/simix/smx_context_sysv.c
)
-else(
${CONTEXT_UCONTEXT}
) # NOT ucontext
+else() # NOT ucontext
set(EXTRA_DIST
${EXTRA_DIST}
src/simix/smx_context_sysv.c
)
set(EXTRA_DIST
${EXTRA_DIST}
src/simix/smx_context_sysv.c
)
-endif(
${CONTEXT_UCONTEXT}
)
+endif()
# -->HAVE_GTNETS
if(HAVE_GTNETS)
set(GTNETS_USED
${GTNETS_SRC}
)
# -->HAVE_GTNETS
if(HAVE_GTNETS)
set(GTNETS_USED
${GTNETS_SRC}
)
-else(
HAVE_GTNETS
)
+else()
set(GTNETS_USED "")
set(EXTRA_DIST
${EXTRA_DIST}
${GTNETS_SRC}
)
set(GTNETS_USED "")
set(EXTRA_DIST
${EXTRA_DIST}
${GTNETS_SRC}
)
-endif(
HAVE_GTNETS
)
+endif()
### Simgrid Lib sources
set(simgrid_sources
### Simgrid Lib sources
set(simgrid_sources
@@
-558,14
+562,14
@@
if(HAVE_MC)
${simgrid_sources}
${MC_SRC}
)
${simgrid_sources}
${MC_SRC}
)
-endif(
HAVE_MC
)
+endif()
if(HAVE_NS3)
set(simgrid_sources
${simgrid_sources}
${NS3_SRC}
)
if(HAVE_NS3)
set(simgrid_sources
${simgrid_sources}
${NS3_SRC}
)
-endif(
HAVE_NS3
)
+endif()
# WINDOWS
if(WIN32)
# WINDOWS
if(WIN32)
@@
-575,7
+579,7
@@
if(WIN32)
src/xbt/win32_ucontext.c
src/xbt/xbt_os_thread.c
)
src/xbt/win32_ucontext.c
src/xbt/xbt_os_thread.c
)
-endif(
WIN32
)
+endif()
### Gras Lib sources
set(gras_sources
### Gras Lib sources
set(gras_sources
@@
-590,12
+594,12
@@
if(${HAVE_LUA})
${simgrid_sources}
${LUA_SRC}
)
${simgrid_sources}
${LUA_SRC}
)
-else(
${HAVE_LUA}
)
+else()
set(EXTRA_DIST
${EXTRA_DIST}
${LUA_SRC}
)
set(EXTRA_DIST
${EXTRA_DIST}
${LUA_SRC}
)
-endif(
${HAVE_LUA}
)
+endif()
set(DOC_SOURCES
doc/amok_bw_sat.png
set(DOC_SOURCES
doc/amok_bw_sat.png
@@
-738,7
+742,6
@@
set(EXTRA_LISTE_GTUT
)
set(REF_GUIDE_SOURCES
)
set(REF_GUIDE_SOURCES
- doc/ref_guide/doxygen/index-API.doc
doc/ref_guide/doxygen/footer.html
doc/ref_guide/doxygen/header.html
doc/ref_guide/doxygen/main.doc
doc/ref_guide/doxygen/footer.html
doc/ref_guide/doxygen/header.html
doc/ref_guide/doxygen/main.doc
@@
-830,9
+833,6
@@
set(bin_files
)
set(txt_files
)
set(txt_files
- "testsuite/surf/trace_A.txt"
- "testsuite/surf/trace_A_failure.txt"
- "testsuite/surf/trace_B.txt"
${txt_files}
AUTHORS
COPYING
${txt_files}
AUTHORS
COPYING
@@
-912,6
+912,11
@@
set(TESHSUITE_CMAKEFILES_TXT
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/xbt/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/xbt/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
+ teshsuite/smpi/mpich-test/env/CMakeLists.txt
+ teshsuite/smpi/mpich-test/coll/CMakeLists.txt
+ teshsuite/smpi/mpich-test/context/CMakeLists.txt
+ teshsuite/smpi/mpich-test/profile/CMakeLists.txt
+ teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
)
set(TOOLS_CMAKEFILES_TXT
)
set(TOOLS_CMAKEFILES_TXT