From 476b9a8841184e84c96ab91147789a2cdcca66c0 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 11 Feb 2013 16:19:13 +0100 Subject: [PATCH] resolve cmakelists conflict Conflicts: examples/simdag/CMakeLists.txt --- examples/msg/actions/CMakeLists.txt | 2 +- examples/msg/chainsend/CMakeLists.txt | 2 +- examples/msg/cloud/CMakeLists.txt | 2 +- examples/msg/gpu/CMakeLists.txt | 2 +- examples/msg/gtnets/CMakeLists.txt | 2 +- examples/msg/io/CMakeLists.txt | 4 +- examples/msg/masterslave/CMakeLists.txt | 16 +- examples/msg/mc/CMakeLists.txt | 26 +-- examples/msg/migration/CMakeLists.txt | 2 +- examples/msg/ns3/CMakeLists.txt | 2 +- examples/msg/parallel_task/CMakeLists.txt | 4 +- examples/msg/pmm/CMakeLists.txt | 2 +- examples/msg/priority/CMakeLists.txt | 2 +- examples/msg/properties/CMakeLists.txt | 2 +- examples/msg/sendrecv/CMakeLists.txt | 2 +- examples/msg/start_kill_time/CMakeLists.txt | 2 +- examples/msg/suspend/CMakeLists.txt | 2 +- examples/msg/token_ring/CMakeLists.txt | 4 +- examples/msg/tracing/CMakeLists.txt | 16 +- examples/simdag/CMakeLists.txt | 22 +- examples/simdag/dax/CMakeLists.txt | 2 +- examples/simdag/goal/CMakeLists.txt | 2 +- examples/simdag/metaxml/CMakeLists.txt | 2 +- examples/simdag/properties/CMakeLists.txt | 2 +- examples/smpi/CMakeLists.txt | 14 +- examples/smpi/MM/CMakeLists.txt | 2 +- src/smpi/smpicc.in | 2 +- teshsuite/msg/trace/CMakeLists.txt | 2 +- teshsuite/smpi/CMakeLists.txt | 38 ++-- teshsuite/smpi/mpich-test/coll/CMakeLists.txt | 76 +++---- .../smpi/mpich-test/context/CMakeLists.txt | 34 ++-- teshsuite/smpi/mpich-test/env/CMakeLists.txt | 47 +++-- .../smpi/mpich-test/profile/CMakeLists.txt | 10 +- .../smpi/mpich-test/pt2pt/CMakeLists.txt | 189 +++++++++--------- 34 files changed, 288 insertions(+), 252 deletions(-) diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index 8691c9dc7d..419c27ee6e 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -4,7 +4,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(actions actions.c) ### Add definitions for compile -target_link_libraries(actions simgrid m) +target_link_libraries(actions simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt index 26ff3cb0a6..5111865c3b 100644 --- a/examples/msg/chainsend/CMakeLists.txt +++ b/examples/msg/chainsend/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(chainsend chainsend.c iterator.c common.c messages.c broadcaster.c peer.c) ### Add definitions for compile -target_link_libraries(chainsend simgrid m ) +target_link_libraries(chainsend simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt index c06ebfaa0e..534992d591 100644 --- a/examples/msg/cloud/CMakeLists.txt +++ b/examples/msg/cloud/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(masterslave_virtual_machines "masterslave_virtual_machines.c") if(WIN32) target_link_libraries(masterslave_virtual_machines simgrid ) else() - target_link_libraries(masterslave_virtual_machines simgrid m) + target_link_libraries(masterslave_virtual_machines simgrid) endif() set(tesh_files diff --git a/examples/msg/gpu/CMakeLists.txt b/examples/msg/gpu/CMakeLists.txt index d7e8e5a301..9017ddc184 100644 --- a/examples/msg/gpu/CMakeLists.txt +++ b/examples/msg/gpu/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(test_MSG_gpu_task_create "test_MSG_gpu_task_create.c") ### Add definitions for compile -target_link_libraries(test_MSG_gpu_task_create simgrid m ) +target_link_libraries(test_MSG_gpu_task_create simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt index 9d28349ec4..f4d8156e1b 100644 --- a/examples/msg/gtnets/CMakeLists.txt +++ b/examples/msg/gtnets/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(gtnets gtnets.c) ### Add definitions for compile -target_link_libraries(gtnets simgrid m) +target_link_libraries(gtnets simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/io/CMakeLists.txt b/examples/msg/io/CMakeLists.txt index d3f612e3f0..3285b5e0f9 100644 --- a/examples/msg/io/CMakeLists.txt +++ b/examples/msg/io/CMakeLists.txt @@ -7,8 +7,8 @@ add_executable(file_unlink file_unlink.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(file simgrid m pthread) - target_link_libraries(file_unlink simgrid m pthread) + target_link_libraries(file simgrid pthread) + target_link_libraries(file_unlink simgrid pthread) else() target_link_libraries(file simgrid) target_link_libraries(file_unlink simgrid) diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 9efb438e51..91d61fb241 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -23,14 +23,14 @@ if(WIN32) target_link_libraries(masterslave_platfgen simgrid ) target_link_libraries(masterslave_failure_platfgen simgrid ) else() - target_link_libraries(masterslave_forwarder simgrid m ) - target_link_libraries(masterslave_failure simgrid m ) - target_link_libraries(masterslave_mailbox simgrid m ) - target_link_libraries(masterslave_bypass simgrid m ) - target_link_libraries(masterslave_kill simgrid m ) - target_link_libraries(masterslave_arg simgrid m ) - target_link_libraries(masterslave_platfgen simgrid m ) - target_link_libraries(masterslave_failure_platfgen simgrid m ) + target_link_libraries(masterslave_forwarder simgrid ) + target_link_libraries(masterslave_failure simgrid ) + target_link_libraries(masterslave_mailbox simgrid ) + target_link_libraries(masterslave_bypass simgrid ) + target_link_libraries(masterslave_kill simgrid ) + target_link_libraries(masterslave_arg simgrid ) + target_link_libraries(masterslave_platfgen simgrid ) + target_link_libraries(masterslave_failure_platfgen simgrid ) endif() target_link_libraries(masterslave_cluster simgrid) diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index 534a29f8a3..784334c234 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -20,19 +20,19 @@ if(HAVE_MC) add_executable(test/snapshot_comparison4 test/snapshot_comparison4.c) add_executable(test/snapshot_comparison5 test/snapshot_comparison5.c) - target_link_libraries(centralized simgrid m ) - target_link_libraries(bugged1 simgrid m ) - target_link_libraries(bugged2 simgrid m ) - target_link_libraries(bugged3 simgrid m ) - target_link_libraries(random_test simgrid m ) - target_link_libraries(bugged1_liveness simgrid m ) - target_link_libraries(bugged2_liveness simgrid m ) - target_link_libraries(chord/chord_liveness simgrid m ) - target_link_libraries(test/snapshot_comparison1 simgrid m ) - target_link_libraries(test/snapshot_comparison2 simgrid m ) - target_link_libraries(test/snapshot_comparison3 simgrid m ) - target_link_libraries(test/snapshot_comparison4 simgrid m ) - target_link_libraries(test/snapshot_comparison5 simgrid m ) + target_link_libraries(centralized simgrid ) + target_link_libraries(bugged1 simgrid ) + target_link_libraries(bugged2 simgrid ) + target_link_libraries(bugged3 simgrid ) + target_link_libraries(random_test simgrid ) + target_link_libraries(bugged1_liveness simgrid ) + target_link_libraries(bugged2_liveness simgrid ) + target_link_libraries(chord/chord_liveness simgrid ) + target_link_libraries(test/snapshot_comparison1 simgrid ) + target_link_libraries(test/snapshot_comparison2 simgrid ) + target_link_libraries(test/snapshot_comparison3 simgrid ) + target_link_libraries(test/snapshot_comparison4 simgrid ) + target_link_libraries(test/snapshot_comparison5 simgrid ) endif() diff --git a/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt index 107f2c4f0e..cd138326aa 100644 --- a/examples/msg/migration/CMakeLists.txt +++ b/examples/msg/migration/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(migration migration.c) ### Add definitions for compile -target_link_libraries(migration simgrid m ) +target_link_libraries(migration simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt index a32eb655f7..14d1498b47 100644 --- a/examples/msg/ns3/CMakeLists.txt +++ b/examples/msg/ns3/CMakeLists.txt @@ -6,7 +6,7 @@ if(HAVE_NS3) add_executable(ns3 "ns3.c") ### Add definitions for compile - target_link_libraries(ns3 simgrid m ) + target_link_libraries(ns3 simgrid ) endif() set(tesh_files diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt index 863847c243..788b2e8f1c 100644 --- a/examples/msg/parallel_task/CMakeLists.txt +++ b/examples/msg/parallel_task/CMakeLists.txt @@ -6,8 +6,8 @@ add_executable(parallel_task parallel_task.c) add_executable(test_ptask test_ptask.c) ### Add definitions for compile -target_link_libraries(parallel_task simgrid m ) -target_link_libraries(test_ptask simgrid m ) +target_link_libraries(parallel_task simgrid ) +target_link_libraries(test_ptask simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/pmm/CMakeLists.txt b/examples/msg/pmm/CMakeLists.txt index 43649dd0b9..2e48d86c90 100644 --- a/examples/msg/pmm/CMakeLists.txt +++ b/examples/msg/pmm/CMakeLists.txt @@ -4,7 +4,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(msg_pmm msg_pmm.c) -target_link_libraries(msg_pmm simgrid m ) +target_link_libraries(msg_pmm simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/priority/CMakeLists.txt b/examples/msg/priority/CMakeLists.txt index 408c33ca48..700796e362 100644 --- a/examples/msg/priority/CMakeLists.txt +++ b/examples/msg/priority/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(priority priority.c) ### Add definitions for compile -target_link_libraries(priority simgrid m) +target_link_libraries(priority simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt index 4bbf294d47..ac68edeb16 100644 --- a/examples/msg/properties/CMakeLists.txt +++ b/examples/msg/properties/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(msg_prop msg_prop.c) ### Add definitions for compile -target_link_libraries(msg_prop simgrid m ) +target_link_libraries(msg_prop simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt index cca117221a..bc61bfd0e1 100644 --- a/examples/msg/sendrecv/CMakeLists.txt +++ b/examples/msg/sendrecv/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(sendrecv sendrecv.c) ### Add definitions for compile -target_link_libraries(sendrecv simgrid m ) +target_link_libraries(sendrecv simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/start_kill_time/CMakeLists.txt b/examples/msg/start_kill_time/CMakeLists.txt index 7f291d08db..e7e84a8cef 100644 --- a/examples/msg/start_kill_time/CMakeLists.txt +++ b/examples/msg/start_kill_time/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(sk_time "sk_time.c") if(WIN32) target_link_libraries(sk_time simgrid ) else() - target_link_libraries(sk_time simgrid m ) + target_link_libraries(sk_time simgrid ) endif() set(tesh_files diff --git a/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt index 6a25df4571..cb358b8e12 100644 --- a/examples/msg/suspend/CMakeLists.txt +++ b/examples/msg/suspend/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(suspend suspend.c) ### Add definitions for compile -target_link_libraries(suspend simgrid m ) +target_link_libraries(suspend simgrid ) set(tesh_files ${tesh_files} diff --git a/examples/msg/token_ring/CMakeLists.txt b/examples/msg/token_ring/CMakeLists.txt index f3e07d48c2..c6d5f01e3b 100644 --- a/examples/msg/token_ring/CMakeLists.txt +++ b/examples/msg/token_ring/CMakeLists.txt @@ -7,8 +7,8 @@ add_executable(token_bypass token_bypass.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(token_ring simgrid m pthread ) - target_link_libraries(token_bypass simgrid m pthread ) + target_link_libraries(token_ring simgrid pthread ) + target_link_libraries(token_bypass simgrid pthread ) else() target_link_libraries(token_ring simgrid) target_link_libraries(token_bypass simgrid) diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index f177544060..215a084f54 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -14,14 +14,14 @@ if(HAVE_TRACING) add_executable(link_srcdst_user_variables ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.c) ### Add definitions for compile - target_link_libraries(ms simgrid m ) - target_link_libraries(categories simgrid m ) - target_link_libraries(procmig simgrid m ) - target_link_libraries(simple simgrid m ) - target_link_libraries(trace_platform simgrid m ) - target_link_libraries(user_variables simgrid m ) - target_link_libraries(link_user_variables simgrid m ) - target_link_libraries(link_srcdst_user_variables simgrid m ) + target_link_libraries(ms simgrid ) + target_link_libraries(categories simgrid ) + target_link_libraries(procmig simgrid ) + target_link_libraries(simple simgrid ) + target_link_libraries(trace_platform simgrid ) + target_link_libraries(user_variables simgrid ) + target_link_libraries(link_user_variables simgrid ) + target_link_libraries(link_srcdst_user_variables simgrid ) ## Clean generated files get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index afb0ab6884..01e646bed3 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -9,18 +9,22 @@ add_executable(sd_avail sd_avail.c) add_executable(sd_typed_tasks_test sd_typed_tasks_test.c) add_executable(sd_comm_throttling sd_comm_throttling.c) add_executable(sd_seq_access sd_seq_access.c) -add_executable(simdag_tracing simdag_trace.c) +if (HAVE_TRACING) + add_executable(simdag_tracing simdag_trace.c) +endif() ### Add definitions for compile if(NOT WIN32) - target_link_libraries(ex_sd_test simgrid pthread m ) - target_link_libraries(sd_test2 simgrid pthread m ) - target_link_libraries(sd_fail simgrid pthread m ) - target_link_libraries(sd_avail simgrid pthread m ) - target_link_libraries(sd_typed_tasks_test simgrid pthread m ) - target_link_libraries(sd_comm_throttling simgrid pthread m ) - target_link_libraries(sd_seq_access simgrid pthread m ) - target_link_libraries(simdag_tracing simgrid pthread m ) + target_link_libraries(ex_sd_test simgrid pthread ) + target_link_libraries(sd_test2 simgrid pthread ) + target_link_libraries(sd_fail simgrid pthread ) + target_link_libraries(sd_avail simgrid pthread ) + target_link_libraries(sd_typed_tasks_test simgrid pthread ) + target_link_libraries(sd_comm_throttling simgrid pthread ) + target_link_libraries(sd_seq_access simgrid pthread ) + if (HAVE_TRACING) + target_link_libraries(simdag_tracing simgrid pthread ) + endif() add_custom_command(TARGET ex_sd_test POST_BUILD diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index 585e989432..669dd41503 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(dax_test dax_test.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(dax_test simgrid pthread m ) + target_link_libraries(dax_test simgrid pthread ) else() target_link_libraries(dax_test simgrid) endif() diff --git a/examples/simdag/goal/CMakeLists.txt b/examples/simdag/goal/CMakeLists.txt index c6267e4927..4c43abb8b7 100644 --- a/examples/simdag/goal/CMakeLists.txt +++ b/examples/simdag/goal/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(goal_test goal_test.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(goal_test simgrid pthread m ) + target_link_libraries(goal_test simgrid pthread ) else() target_link_libraries(goal_test simgrid) endif() diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt index 3f0417fca7..b08db6d14c 100644 --- a/examples/simdag/metaxml/CMakeLists.txt +++ b/examples/simdag/metaxml/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(sd_meta sd_meta.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(sd_meta simgrid pthread m ) + target_link_libraries(sd_meta simgrid pthread ) else() target_link_libraries(sd_meta simgrid) endif() diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt index 04e4cce888..833a9fc02c 100644 --- a/examples/simdag/properties/CMakeLists.txt +++ b/examples/simdag/properties/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(sd_prop sd_prop.c) ### Add definitions for compile if(NOT WIN32) - target_link_libraries(sd_prop simgrid pthread m ) + target_link_libraries(sd_prop simgrid pthread ) else() target_link_libraries(sd_prop simgrid) endif() diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index 85ee3e6d61..b6d92ec00d 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -20,13 +20,13 @@ if(enable_smpi) add_executable(mc_bugged2 mc_bugged2.c) add_executable(smpi_replay replay/replay.c) - target_link_libraries(bcbench m simgrid smpi ) - target_link_libraries(mvmul m simgrid smpi ) - target_link_libraries(smpi_traced m simgrid smpi ) - target_link_libraries(smpi_traced_simple m simgrid smpi ) - target_link_libraries(mc_bugged1 m simgrid smpi ) - target_link_libraries(mc_bugged2 m simgrid smpi ) - target_link_libraries(smpi_replay m simgrid smpi ) + target_link_libraries(bcbench simgrid smpi ) + target_link_libraries(mvmul simgrid smpi ) + target_link_libraries(smpi_traced simgrid smpi ) + target_link_libraries(smpi_traced_simple simgrid smpi ) + target_link_libraries(mc_bugged1 simgrid smpi ) + target_link_libraries(mc_bugged2 simgrid smpi ) + target_link_libraries(smpi_replay simgrid smpi ) endif() diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt index ece8c47d8e..29650489ea 100644 --- a/examples/smpi/MM/CMakeLists.txt +++ b/examples/smpi/MM/CMakeLists.txt @@ -8,7 +8,7 @@ if(enable_smpi) if(NOT WIN32) add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) ### Add definitions for compile - target_link_libraries(MM_mpi simgrid pthread m smpi) + target_link_libraries(MM_mpi simgrid pthread smpi) endif() endif() diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in index 1c6e3ebda2..38240c0f55 100755 --- a/src/smpi/smpicc.in +++ b/src/smpi/smpicc.in @@ -7,7 +7,7 @@ CMAKE_LINKARGS="-L@libdir@" if [ "@WIN32@" != "1" ]; then CFLAGS="-Dmain=smpi_simulated_main__" - LINKARGS="-lsimgrid -lsmpi -lm" + LINKARGS="-lsimgrid -lsmpi" else CFLAGS="-include @includedir@/smpi/smpi_main.h" LINKARGS="@libdir@\libsimgrid.dll @libdir@\libsmpi.dll" diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt index 38371548cf..96ebc4a64f 100644 --- a/teshsuite/msg/trace/CMakeLists.txt +++ b/teshsuite/msg/trace/CMakeLists.txt @@ -5,7 +5,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(test_trace_integration test_trace_integration.c) ### Add definitions for compile -target_link_libraries(test_trace_integration simgrid m ) +target_link_libraries(test_trace_integration simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index 76749595c9..edf684095f 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -4,7 +4,7 @@ if(enable_smpi) if(WIN32) set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") else() - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_C_COMPILER "sh ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") @@ -30,24 +30,24 @@ if(enable_smpi) add_executable(indexed_test indexed_test.c) add_executable(struct_test struct_test.c) - target_link_libraries(alltoall2 m simgrid smpi ) - target_link_libraries(alltoall_basic m simgrid smpi ) - target_link_libraries(alltoallv m simgrid smpi ) - target_link_libraries(allreduce m simgrid smpi ) - target_link_libraries(bcast m simgrid smpi ) - target_link_libraries(compute m simgrid smpi ) - target_link_libraries(compute2 m simgrid smpi ) - target_link_libraries(compute3 m simgrid smpi ) - target_link_libraries(pingpong m simgrid smpi ) - target_link_libraries(scatter m simgrid smpi ) - target_link_libraries(reduce m simgrid smpi ) - target_link_libraries(split m simgrid smpi ) - target_link_libraries(smpi_sendrecv m simgrid smpi ) - target_link_libraries(ttest01 m simgrid smpi ) - target_link_libraries(vector_test m simgrid smpi ) - target_link_libraries(hvector_test m simgrid smpi ) - target_link_libraries(indexed_test m simgrid smpi ) - target_link_libraries(struct_test m simgrid smpi ) + target_link_libraries(alltoall2 simgrid smpi ) + target_link_libraries(alltoall_basic simgrid smpi ) + target_link_libraries(alltoallv simgrid smpi ) + target_link_libraries(allreduce simgrid smpi ) + target_link_libraries(bcast simgrid smpi ) + target_link_libraries(compute simgrid smpi ) + target_link_libraries(compute2 simgrid smpi ) + target_link_libraries(compute3 simgrid smpi ) + target_link_libraries(pingpong simgrid smpi ) + target_link_libraries(scatter simgrid smpi ) + target_link_libraries(reduce simgrid smpi ) + target_link_libraries(split simgrid smpi ) + target_link_libraries(smpi_sendrecv simgrid smpi ) + target_link_libraries(ttest01 simgrid smpi ) + target_link_libraries(vector_test simgrid smpi ) + target_link_libraries(hvector_test simgrid smpi ) + target_link_libraries(indexed_test simgrid smpi ) + target_link_libraries(struct_test simgrid smpi ) set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv) diff --git a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt index d6ba9329dc..7cb0c9436e 100644 --- a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt @@ -1,8 +1,14 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + + if(WIN32) + set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") + else() + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + endif() + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1") @@ -45,40 +51,40 @@ if(enable_smpi) add_executable(bcastlog bcastlog.f) endif() - target_link_libraries(coll1 m simgrid smpi ) - target_link_libraries(coll2 m simgrid smpi ) - target_link_libraries(coll3 m simgrid smpi ) - target_link_libraries(coll4 m simgrid smpi ) - target_link_libraries(coll5 m simgrid smpi ) - target_link_libraries(coll6 m simgrid smpi ) - target_link_libraries(coll7 m simgrid smpi ) - target_link_libraries(coll8 m simgrid smpi ) - target_link_libraries(coll9 m simgrid smpi ) - target_link_libraries(coll10 m simgrid smpi ) - target_link_libraries(coll11 m simgrid smpi ) - target_link_libraries(coll12 m simgrid smpi ) - target_link_libraries(coll13 m simgrid smpi ) - target_link_libraries(allredmany m simgrid smpi ) - target_link_libraries(bcastbug m simgrid smpi ) - target_link_libraries(bcastbug2 m simgrid smpi ) - target_link_libraries(bcastvec m simgrid smpi ) - target_link_libraries(grouptest m simgrid smpi ) - target_link_libraries(redtst m simgrid smpi ) - target_link_libraries(barrier m simgrid smpi ) - target_link_libraries(bcast_mpich m simgrid smpi ) - target_link_libraries(allred m simgrid smpi ) - target_link_libraries(allred2 m simgrid smpi ) - target_link_libraries(scatterv m simgrid smpi ) - target_link_libraries(scattern m simgrid smpi ) - target_link_libraries(redscat m simgrid smpi ) - target_link_libraries(longuser m simgrid smpi ) - target_link_libraries(alltoallv_mpich m simgrid smpi ) - target_link_libraries(scantst m simgrid smpi ) + target_link_libraries(coll1 simgrid smpi ) + target_link_libraries(coll2 simgrid smpi ) + target_link_libraries(coll3 simgrid smpi ) + target_link_libraries(coll4 simgrid smpi ) + target_link_libraries(coll5 simgrid smpi ) + target_link_libraries(coll6 simgrid smpi ) + target_link_libraries(coll7 simgrid smpi ) + target_link_libraries(coll8 simgrid smpi ) + target_link_libraries(coll9 simgrid smpi ) + target_link_libraries(coll10 simgrid smpi ) + target_link_libraries(coll11 simgrid smpi ) + target_link_libraries(coll12 simgrid smpi ) + target_link_libraries(coll13 simgrid smpi ) + target_link_libraries(allredmany simgrid smpi ) + target_link_libraries(bcastbug simgrid smpi ) + target_link_libraries(bcastbug2 simgrid smpi ) + target_link_libraries(bcastvec simgrid smpi ) + target_link_libraries(grouptest simgrid smpi ) + target_link_libraries(redtst simgrid smpi ) + target_link_libraries(barrier simgrid smpi ) + target_link_libraries(bcast_mpich simgrid smpi ) + target_link_libraries(allred simgrid smpi ) + target_link_libraries(allred2 simgrid smpi ) + target_link_libraries(scatterv simgrid smpi ) + target_link_libraries(scattern simgrid smpi ) + target_link_libraries(redscat simgrid smpi ) + target_link_libraries(longuser simgrid smpi ) + target_link_libraries(alltoallv_mpich simgrid smpi ) + target_link_libraries(scantst simgrid smpi ) if(SMPI_F2C) - target_link_libraries(allredf m simgrid smpi ) - target_link_libraries(assocf m simgrid smpi ) - target_link_libraries(allgatherf m simgrid smpi ) - target_link_libraries(bcastlog m simgrid smpi ) + target_link_libraries(allredf simgrid smpi ) + target_link_libraries(assocf simgrid smpi ) + target_link_libraries(allgatherf simgrid smpi ) + target_link_libraries(bcastlog simgrid smpi ) endif() set_target_properties(coll1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/context/CMakeLists.txt b/teshsuite/smpi/mpich-test/context/CMakeLists.txt index 86f4b0a499..4defd0ff20 100644 --- a/teshsuite/smpi/mpich-test/context/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/context/CMakeLists.txt @@ -1,9 +1,15 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") - set(CMAKE_Fortran_LINKER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + + if(WIN32) + set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") + else() + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + set(CMAKE_Fortran_LINKER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + endif() + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1") @@ -24,19 +30,19 @@ if(enable_smpi) #add_executable(commnames_f commnamesf.f) endif() - target_link_libraries(attrerr m simgrid smpi ) - # target_link_libraries(attrt m simgrid smpi ) - # target_link_libraries(commnames m simgrid smpi ) - target_link_libraries(groupcreate m simgrid smpi ) - target_link_libraries(grouptest_mpich m simgrid smpi ) - target_link_libraries(icdup m simgrid smpi ) - target_link_libraries(ictest m simgrid smpi ) - target_link_libraries(ictest2 m simgrid smpi ) - target_link_libraries(ictest3 m simgrid smpi ) + target_link_libraries(attrerr simgrid smpi ) + # target_link_libraries(attrt simgrid smpi ) + # target_link_libraries(commnames simgrid smpi ) + target_link_libraries(groupcreate simgrid smpi ) + target_link_libraries(grouptest_mpich simgrid smpi ) + target_link_libraries(icdup simgrid smpi ) + target_link_libraries(ictest simgrid smpi ) + target_link_libraries(ictest2 simgrid smpi ) + target_link_libraries(ictest3 simgrid smpi ) if(SMPI_F2C) - #target_link_libraries(attrtest_f m simgrid smpi f2c) - #target_link_libraries(commnames_f m simgrid smpi f2c) + #target_link_libraries(attrtest_f simgrid smpi f2c) + #target_link_libraries(commnames_f simgrid smpi f2c) endif() set_target_properties(attrerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/env/CMakeLists.txt b/teshsuite/smpi/mpich-test/env/CMakeLists.txt index 2bd3106b1a..a81ab47b4d 100644 --- a/teshsuite/smpi/mpich-test/env/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/env/CMakeLists.txt @@ -1,8 +1,13 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + if(WIN32) + set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") + else() + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + endif() + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1") @@ -14,7 +19,9 @@ if(enable_smpi) add_executable(baseattr baseattr.c test.c) add_executable(gtime gtime.c test.c) add_executable(errhand errhand.c test.c) - add_executable(sigchk sigchk.c test.c) + if(NOT WIN32) + add_executable(sigchk sigchk.c test.c) + endif() add_executable(aborttest aborttest.c) add_executable(testerr testerr.c) add_executable(getproc getproc.c) @@ -24,21 +31,23 @@ if(enable_smpi) # add_executable(errstringsf errstringsf.f) add_executable(getprocf getprocf.f) endif() - target_link_libraries(init m simgrid smpi ) - target_link_libraries(timers m simgrid smpi ) - target_link_libraries(timertest m simgrid smpi ) - target_link_libraries(baseattr m simgrid smpi ) - target_link_libraries(gtime m simgrid smpi ) - target_link_libraries(errhand m simgrid smpi ) - target_link_libraries(sigchk m simgrid smpi ) - target_link_libraries(aborttest m simgrid smpi ) - target_link_libraries(testerr m simgrid smpi ) - target_link_libraries(getproc m simgrid smpi ) + target_link_libraries(init simgrid smpi ) + target_link_libraries(timers simgrid smpi ) + target_link_libraries(timertest simgrid smpi ) + target_link_libraries(baseattr simgrid smpi ) + target_link_libraries(gtime simgrid smpi ) + target_link_libraries(errhand simgrid smpi ) + if(NOT WIN32) + target_link_libraries(sigchk simgrid smpi ) + endif() + target_link_libraries(aborttest simgrid smpi ) + target_link_libraries(testerr simgrid smpi ) + target_link_libraries(getproc simgrid smpi ) if(SMPI_F2C) -# target_link_libraries(baseattrf m simgrid smpi ) -# target_link_libraries(errhandf m simgrid smpi ) -# target_link_libraries(errstringsf m simgrid smpi ) - target_link_libraries(getprocf m simgrid smpi ) +# target_link_libraries(baseattrf simgrid smpi ) +# target_link_libraries(errhandf simgrid smpi ) +# target_link_libraries(errstringsf simgrid smpi ) + target_link_libraries(getprocf simgrid smpi ) endif() set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") @@ -47,7 +56,9 @@ if(enable_smpi) set_target_properties(baseattr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(gtime PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(errhand PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") - set_target_properties(sigchk PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + if(NOT WIN32) + set_target_properties(sigchk PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") + endif() set_target_properties(aborttest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(testerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(getproc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt index 60b8d47bf2..024ee2b27f 100644 --- a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + if(WIN32) + set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") + else() + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + endif() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1") @@ -11,8 +15,8 @@ if(enable_smpi) add_executable(ptest ptest.c ) add_executable(colluses colluses.c ) - target_link_libraries(ptest m simgrid smpi ) - target_link_libraries(colluses m simgrid smpi ) + target_link_libraries(ptest simgrid smpi ) + target_link_libraries(colluses simgrid smpi ) set_target_properties(ptest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(colluses PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt index a41d932885..5482e0c2b7 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt @@ -1,8 +1,13 @@ cmake_minimum_required(VERSION 2.6) if(enable_smpi) - set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + if(WIN32) + set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h") + else() + set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") + set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") + endif() + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1") @@ -100,97 +105,97 @@ if(enable_smpi) add_executable(typebasef typebasef.f) endif() - target_link_libraries(overtake m simgrid smpi ) - target_link_libraries(bsendtest m simgrid smpi ) - target_link_libraries(relrank m simgrid smpi ) - target_link_libraries(sendrecv_mpich m simgrid smpi ) - target_link_libraries(persistent m simgrid smpi ) - target_link_libraries(flood m simgrid smpi ) - target_link_libraries(flood2 m simgrid smpi ) - target_link_libraries(persist m simgrid smpi ) - target_link_libraries(persist2 m simgrid smpi ) - target_link_libraries(sendrecv2 m simgrid smpi ) - target_link_libraries(sendrecv3 m simgrid smpi ) - target_link_libraries(sendrecv4 m simgrid smpi ) - target_link_libraries(irsend m simgrid smpi ) - target_link_libraries(irsendinit m simgrid smpi ) - target_link_libraries(longmsgs m simgrid smpi ) - target_link_libraries(testsome m simgrid smpi ) - target_link_libraries(testall_mpich m simgrid smpi ) - target_link_libraries(sndrcv m simgrid smpi ) - target_link_libraries(sndrcvrep m simgrid smpi ) - target_link_libraries(sndrcvrpl2 m simgrid smpi ) - target_link_libraries(getelm m simgrid smpi ) - target_link_libraries(self m simgrid smpi ) - target_link_libraries(typelb m simgrid smpi ) - target_link_libraries(structlb m simgrid smpi ) - target_link_libraries(typeub m simgrid smpi ) - target_link_libraries(typeub2 m simgrid smpi ) - target_link_libraries(typeub3 m simgrid smpi ) - target_link_libraries(typecreate m simgrid smpi ) - target_link_libraries(reqcreate m simgrid smpi ) - target_link_libraries(reqfree m simgrid smpi ) - target_link_libraries(isndrcv m simgrid smpi ) - target_link_libraries(nullproc m simgrid smpi ) - target_link_libraries(nullproc2 m simgrid smpi ) - target_link_libraries(trunc m simgrid smpi ) - target_link_libraries(truncmult m simgrid smpi ) - target_link_libraries(typetest m simgrid smpi ) - target_link_libraries(typebase m simgrid smpi ) - target_link_libraries(ssendtest m simgrid smpi ) - target_link_libraries(ssendtest2 m simgrid smpi ) - target_link_libraries(issendtest m simgrid smpi ) - target_link_libraries(issend2 m simgrid smpi ) - target_link_libraries(issendinit m simgrid smpi ) - target_link_libraries(testtypes m simgrid smpi ) - target_link_libraries(dataalign m simgrid smpi ) - target_link_libraries(dtyperecv m simgrid smpi ) - target_link_libraries(dtypelife m simgrid smpi ) - target_link_libraries(htmsg m simgrid smpi ) - target_link_libraries(isendtest m simgrid smpi ) - target_link_libraries(third m simgrid smpi ) - target_link_libraries(fourth m simgrid smpi ) - target_link_libraries(fifth m simgrid smpi ) - target_link_libraries(sixth m simgrid smpi ) - target_link_libraries(probe m simgrid smpi ) - target_link_libraries(nblock m simgrid smpi ) - target_link_libraries(sendmany m simgrid smpi ) - target_link_libraries(order m simgrid smpi ) - target_link_libraries(pack m simgrid smpi ) - target_link_libraries(probe1 m simgrid smpi ) - target_link_libraries(testtest1 m simgrid smpi ) - target_link_libraries(hvectest m simgrid smpi ) - target_link_libraries(hvectest2 m simgrid smpi ) - target_link_libraries(hvec m simgrid smpi ) - target_link_libraries(hindexed m simgrid smpi ) - target_link_libraries(irecvtest m simgrid smpi ) - target_link_libraries(nbtest m simgrid smpi ) - target_link_libraries(waitany m simgrid smpi ) - target_link_libraries(waitall m simgrid smpi ) - target_link_libraries(waitall2 m simgrid smpi ) - target_link_libraries(waitall3 m simgrid smpi ) - target_link_libraries(waitall4 m simgrid smpi ) - target_link_libraries(commit m simgrid smpi ) - target_link_libraries(cancel m simgrid smpi ) - target_link_libraries(cancel2 m simgrid smpi ) - target_link_libraries(cancel3 m simgrid smpi ) - target_link_libraries(cancelmessages m simgrid smpi ) - target_link_libraries(cancelibm m simgrid smpi ) - target_link_libraries(cancelissend m simgrid smpi ) - target_link_libraries(sendorder m simgrid smpi ) - target_link_libraries(exittest m simgrid smpi ) - target_link_libraries(selfvsworld m simgrid smpi ) + target_link_libraries(overtake simgrid smpi ) + target_link_libraries(bsendtest simgrid smpi ) + target_link_libraries(relrank simgrid smpi ) + target_link_libraries(sendrecv_mpich simgrid smpi ) + target_link_libraries(persistent simgrid smpi ) + target_link_libraries(flood simgrid smpi ) + target_link_libraries(flood2 simgrid smpi ) + target_link_libraries(persist simgrid smpi ) + target_link_libraries(persist2 simgrid smpi ) + target_link_libraries(sendrecv2 simgrid smpi ) + target_link_libraries(sendrecv3 simgrid smpi ) + target_link_libraries(sendrecv4 simgrid smpi ) + target_link_libraries(irsend simgrid smpi ) + target_link_libraries(irsendinit simgrid smpi ) + target_link_libraries(longmsgs simgrid smpi ) + target_link_libraries(testsome simgrid smpi ) + target_link_libraries(testall_mpich simgrid smpi ) + target_link_libraries(sndrcv simgrid smpi ) + target_link_libraries(sndrcvrep simgrid smpi ) + target_link_libraries(sndrcvrpl2 simgrid smpi ) + target_link_libraries(getelm simgrid smpi ) + target_link_libraries(self simgrid smpi ) + target_link_libraries(typelb simgrid smpi ) + target_link_libraries(structlb simgrid smpi ) + target_link_libraries(typeub simgrid smpi ) + target_link_libraries(typeub2 simgrid smpi ) + target_link_libraries(typeub3 simgrid smpi ) + target_link_libraries(typecreate simgrid smpi ) + target_link_libraries(reqcreate simgrid smpi ) + target_link_libraries(reqfree simgrid smpi ) + target_link_libraries(isndrcv simgrid smpi ) + target_link_libraries(nullproc simgrid smpi ) + target_link_libraries(nullproc2 simgrid smpi ) + target_link_libraries(trunc simgrid smpi ) + target_link_libraries(truncmult simgrid smpi ) + target_link_libraries(typetest simgrid smpi ) + target_link_libraries(typebase simgrid smpi ) + target_link_libraries(ssendtest simgrid smpi ) + target_link_libraries(ssendtest2 simgrid smpi ) + target_link_libraries(issendtest simgrid smpi ) + target_link_libraries(issend2 simgrid smpi ) + target_link_libraries(issendinit simgrid smpi ) + target_link_libraries(testtypes simgrid smpi ) + target_link_libraries(dataalign simgrid smpi ) + target_link_libraries(dtyperecv simgrid smpi ) + target_link_libraries(dtypelife simgrid smpi ) + target_link_libraries(htmsg simgrid smpi ) + target_link_libraries(isendtest simgrid smpi ) + target_link_libraries(third simgrid smpi ) + target_link_libraries(fourth simgrid smpi ) + target_link_libraries(fifth simgrid smpi ) + target_link_libraries(sixth simgrid smpi ) + target_link_libraries(probe simgrid smpi ) + target_link_libraries(nblock simgrid smpi ) + target_link_libraries(sendmany simgrid smpi ) + target_link_libraries(order simgrid smpi ) + target_link_libraries(pack simgrid smpi ) + target_link_libraries(probe1 simgrid smpi ) + target_link_libraries(testtest1 simgrid smpi ) + target_link_libraries(hvectest simgrid smpi ) + target_link_libraries(hvectest2 simgrid smpi ) + target_link_libraries(hvec simgrid smpi ) + target_link_libraries(hindexed simgrid smpi ) + target_link_libraries(irecvtest simgrid smpi ) + target_link_libraries(nbtest simgrid smpi ) + target_link_libraries(waitany simgrid smpi ) + target_link_libraries(waitall simgrid smpi ) + target_link_libraries(waitall2 simgrid smpi ) + target_link_libraries(waitall3 simgrid smpi ) + target_link_libraries(waitall4 simgrid smpi ) + target_link_libraries(commit simgrid smpi ) + target_link_libraries(cancel simgrid smpi ) + target_link_libraries(cancel2 simgrid smpi ) + target_link_libraries(cancel3 simgrid smpi ) + target_link_libraries(cancelmessages simgrid smpi ) + target_link_libraries(cancelibm simgrid smpi ) + target_link_libraries(cancelissend simgrid smpi ) + target_link_libraries(sendorder simgrid smpi ) + target_link_libraries(exittest simgrid smpi ) + target_link_libraries(selfvsworld simgrid smpi ) if(SMPI_F2C) - target_link_libraries(secondf m simgrid smpi f2c) -# target_link_libraries(allpair2 m simgrid smpi f2c) -# target_link_libraries(allpair m simgrid smpi f2c) - target_link_libraries(isendf m simgrid smpi f2c) - target_link_libraries(pingpong_f m simgrid smpi f2c) - target_link_libraries(send1 m simgrid smpi f2c) - target_link_libraries(sendcplx m simgrid smpi f2c) - target_link_libraries(sendfort m simgrid smpi f2c) -# target_link_libraries(structf m simgrid smpi f2c) - target_link_libraries(typebasef m simgrid smpi f2c) + target_link_libraries(secondf simgrid smpi f2c) +# target_link_libraries(allpair2 simgrid smpi f2c) +# target_link_libraries(allpair simgrid smpi f2c) + target_link_libraries(isendf simgrid smpi f2c) + target_link_libraries(pingpong_f simgrid smpi f2c) + target_link_libraries(send1 simgrid smpi f2c) + target_link_libraries(sendcplx simgrid smpi f2c) + target_link_libraries(sendfort simgrid smpi f2c) +# target_link_libraries(structf simgrid smpi f2c) + target_link_libraries(typebasef simgrid smpi f2c) endif() set_target_properties(overtake PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") -- 2.20.1