X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e694957c5830a9f1407392fa7f76796274aa4d18..1d355e653ead556d167b9ad690f364366a9432fe:/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
index aae539af51..ca98ccbc6a 100644
--- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi)
+if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
   else()
@@ -9,56 +9,58 @@ if(enable_smpi)
   endif()
 
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(cmfree cmfree.c ../util/mtest.c)
-  add_executable(cmsplit2 cmsplit2.c ../util/mtest.c)
-  add_executable(cmsplit cmsplit.c ../util/mtest.c)
-  add_executable(cmsplit_type cmsplit_type.c ../util/mtest.c)
-  add_executable(commcreate1 commcreate1.c ../util/mtest.c)
-  add_executable(comm_create_group comm_create_group.c ../util/mtest.c)
-  add_executable(comm_group_half comm_group_half.c ../util/mtest.c)
-  add_executable(comm_group_rand comm_group_rand.c ../util/mtest.c)
- # add_executable(comm_idup comm_idup.c ../util/mtest.c)
-  add_executable(comm_info comm_info.c ../util/mtest.c)
-  add_executable(commname commname.c ../util/mtest.c)
-  add_executable(ctxalloc ctxalloc.c ../util/mtest.c)
-  add_executable(ctxsplit ctxsplit.c ../util/mtest.c)
-  add_executable(dup dup.c ../util/mtest.c)
-  add_executable(dupic dupic.c ../util/mtest.c)
-  add_executable(dup_with_info dup_with_info.c ../util/mtest.c)
-  add_executable(ic1 ic1.c ../util/mtest.c)
-  add_executable(ic2 ic2.c ../util/mtest.c)
-  add_executable(iccreate iccreate.c ../util/mtest.c)
-  add_executable(icgroup icgroup.c ../util/mtest.c)
-  add_executable(icm icm.c ../util/mtest.c)
-  add_executable(icsplit icsplit.c ../util/mtest.c)
-  add_executable(probe-intercomm probe-intercomm.c ../util/mtest.c)
+  add_executable(cmfree cmfree.c)
+  add_executable(cmsplit2 cmsplit2.c)
+  add_executable(cmsplit cmsplit.c)
+  add_executable(cmsplit_type cmsplit_type.c)
+  add_executable(commcreate1 commcreate1.c)
+  add_executable(comm_create_group comm_create_group.c)
+  add_executable(comm_group_half comm_group_half.c)
+  add_executable(comm_group_rand comm_group_rand.c)
+#  add_executable(comm_idup comm_idup.c)
+#  add_executable(comm_idup_mul comm_idup_mul.c)
+#  add_executable(comm_idup_overlap comm_idup_overlap.c)
+  add_executable(comm_info comm_info.c)
+#  add_executable(commname commname.c)
+  add_executable(ctxalloc ctxalloc.c)
+  add_executable(ctxsplit ctxsplit.c)
+  add_executable(dup dup.c)
+#  add_executable(dupic dupic.c)
+  add_executable(dup_with_info dup_with_info.c)
+#  add_executable(ic1 ic1.c)
+#  add_executable(ic2 ic2.c)
+#  add_executable(iccreate iccreate.c)
+#  add_executable(icgroup icgroup.c)
+#  add_executable(icm icm.c)
+#  add_executable(icsplit icsplit.c)
+#  add_executable(probe-intercomm probe-intercomm.c)
 
-  target_link_libraries(cmfree  simgrid)
-  target_link_libraries(cmsplit2  simgrid)
-  target_link_libraries(cmsplit  simgrid)
-  target_link_libraries(cmsplit_type  simgrid)
-  target_link_libraries(commcreate1  simgrid)
-  target_link_libraries(comm_create_group  simgrid)
-  target_link_libraries(comm_group_half  simgrid)
-  target_link_libraries(comm_group_rand  simgrid)
- # target_link_libraries(comm_idup  simgrid)
-  target_link_libraries(comm_info  simgrid)
-  target_link_libraries(commname  simgrid)
-  target_link_libraries(ctxalloc  simgrid)
-  target_link_libraries(ctxsplit  simgrid)
-  target_link_libraries(dup  simgrid)
-  target_link_libraries(dupic  simgrid)
-  target_link_libraries(dup_with_info  simgrid)
-  target_link_libraries(ic1  simgrid)
-  target_link_libraries(ic2  simgrid)
-  target_link_libraries(iccreate  simgrid)
-  target_link_libraries(icgroup  simgrid)
-  target_link_libraries(icm  simgrid)
-  target_link_libraries(icsplit  simgrid)
-  target_link_libraries(probe-intercomm  simgrid)
+  target_link_libraries(cmfree simgrid mtest_c)
+  target_link_libraries(cmsplit2 simgrid mtest_c)
+  target_link_libraries(cmsplit simgrid mtest_c)
+  target_link_libraries(cmsplit_type simgrid mtest_c)
+  target_link_libraries(commcreate1 simgrid mtest_c)
+  target_link_libraries(comm_create_group simgrid mtest_c)
+  target_link_libraries(comm_group_half simgrid mtest_c)
+  target_link_libraries(comm_group_rand simgrid mtest_c)
+#  target_link_libraries(comm_idup simgrid mtest_c)
+  target_link_libraries(comm_info simgrid mtest_c)
+#  target_link_libraries(commname simgrid mtest_c)
+  target_link_libraries(ctxalloc simgrid mtest_c)
+  target_link_libraries(ctxsplit simgrid mtest_c)
+  target_link_libraries(dup simgrid mtest_c)
+#  target_link_libraries(dupic simgrid mtest_c)
+  target_link_libraries(dup_with_info simgrid mtest_c)
+#  target_link_libraries(ic1 simgrid mtest_c)
+#  target_link_libraries(ic2 simgrid mtest_c)
+#  target_link_libraries(iccreate simgrid mtest_c)
+#  target_link_libraries(icgroup simgrid mtest_c)
+#  target_link_libraries(icm simgrid mtest_c)
+#  target_link_libraries(icsplit simgrid mtest_c)
+#  target_link_libraries(probe-intercomm simgrid mtest_c)
 
 endif()
 
@@ -81,6 +83,8 @@ set(examples_src
  ${CMAKE_CURRENT_SOURCE_DIR}/comm_group_half.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/comm_group_rand.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/comm_idup.c 
+ ${CMAKE_CURRENT_SOURCE_DIR}/comm_idup_overlap.c 
+ ${CMAKE_CURRENT_SOURCE_DIR}/comm_idup_mul.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/comm_info.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/commname.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/ctxalloc.c