src/smpi/smpi_pmpi.c
src/smpi/smpi_replay.c
src/smpi/smpi_topo.c
- src/surf/surf_routing_cluster_fat_tree.cpp
)
if(SMPI_F2C)
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.cpp
src/surf/surf_routing_cluster_torus.cpp
+ src/surf/surf_routing_cluster_fat_tree.cpp
src/surf/surf_routing_dijkstra.cpp
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_full.cpp
set(bin_files
${bin_files}
src/smpi/smpicc.in
+ src/smpi/smpicxx.in
src/smpi/smpif2c.in
src/smpi/smpiff.in
src/smpi/smpif90.in
set(TESHSUITE_CMAKEFILES_TXT
teshsuite/bug-17132/CMakeLists.txt
+ teshsuite/mc/dwarf/CMakeLists.txt
+ teshsuite/mc/dwarf_expression/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
teshsuite/msg/get_sender/CMakeLists.txt
teshsuite/msg/host_on_off/CMakeLists.txt
teshsuite/msg/storage/CMakeLists.txt
teshsuite/msg/task_destroy_cancel/CMakeLists.txt
teshsuite/msg/trace/CMakeLists.txt
- teshsuite/simdag/CMakeLists.txt
teshsuite/simdag/availability/CMakeLists.txt
+ teshsuite/simdag/basic/CMakeLists.txt
+ teshsuite/simdag/incomplete/CMakeLists.txt
teshsuite/simdag/network/CMakeLists.txt
teshsuite/simdag/network/mxn/CMakeLists.txt
teshsuite/simdag/network/p2p/CMakeLists.txt
teshsuite/simdag/partask/CMakeLists.txt
teshsuite/simdag/platforms/CMakeLists.txt
- teshsuite/simix/CMakeLists.txt
+ teshsuite/simix/check_defaults/CMakeLists.txt
+ teshsuite/simix/stack_overflow/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
+ teshsuite/smpi/allgather/CMakeLists.txt
+ teshsuite/smpi/allgatherv/CMakeLists.txt
+ teshsuite/smpi/allreduce/CMakeLists.txt
+ teshsuite/smpi/alltoall/CMakeLists.txt
+ teshsuite/smpi/alltoallv/CMakeLists.txt
+ teshsuite/smpi/barrier/CMakeLists.txt
+ teshsuite/smpi/bcast/CMakeLists.txt
+ teshsuite/smpi/compute/CMakeLists.txt
+ teshsuite/smpi/gather/CMakeLists.txt
+ teshsuite/smpi/hvector/CMakeLists.txt
+ teshsuite/smpi/indexed/CMakeLists.txt
+ teshsuite/smpi/pingpong/CMakeLists.txt
+ teshsuite/smpi/reduce/CMakeLists.txt
+ teshsuite/smpi/scatter/CMakeLists.txt
+ teshsuite/smpi/shared/CMakeLists.txt
+ teshsuite/smpi/struct/CMakeLists.txt
+ teshsuite/smpi/vector/CMakeLists.txt
teshsuite/smpi/mpich3-test/CMakeLists.txt
teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
-<<<<<<< HEAD
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
-||||||| merged common ancestors
-=======
teshsuite/surf/CMakeLists.txt
teshsuite/surf/lmm_usage/CMakeLists.txt
teshsuite/surf/maxmin_bench/CMakeLists.txt
teshsuite/surf/surf_usage/CMakeLists.txt
teshsuite/surf/trace_usage/CMakeLists.txt
->>>>>>> Move surf testsuite to teshsuite
- teshsuite/xbt/CMakeLists.txt
+ teshsuite/xbt/graphxml_usage/CMakeLists.txt
+ teshsuite/xbt/heap_bench/CMakeLists.txt
+ teshsuite/xbt/log_large/CMakeLists.txt
+ teshsuite/xbt/log_usage/CMakeLists.txt
+ teshsuite/xbt/mmalloc/CMakeLists.txt
+ teshsuite/xbt/parallel_log/CMakeLists.txt
+ teshsuite/xbt/parmap_bench/CMakeLists.txt
+ teshsuite/xbt/parmap_test/CMakeLists.txt
)
set(TOOLS_CMAKEFILES_TXT
tools/tesh/CMakeLists.txt
)
-set(TESTSUITE_CMAKEFILES_TXT
-<<<<<<< HEAD
- testsuite/mc/CMakeLists.txt
- testsuite/surf/CMakeLists.txt
-||||||| merged common ancestors
- testsuite/surf/CMakeLists.txt
-=======
->>>>>>> Move surf testsuite to teshsuite
- testsuite/xbt/CMakeLists.txt
- )
-
set(CMAKE_SOURCE_FILES
CMakeLists.txt
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/Scripts/Makefile.default
buildtools/Cmake/Scripts/SimGrid.packproj
buildtools/Cmake/Scripts/generate_memcheck_tests.pl
- buildtools/Cmake/Scripts/generate_new_tests.pl
buildtools/Cmake/Scripts/java_bundle.sh
buildtools/Cmake/Scripts/my_valgrind.pl
buildtools/Cmake/Scripts/postinstall.sh