Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / 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 715ced5..0621e16 100644 (file)
--- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
@@ -9,7 +7,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   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)
@@ -20,7 +18,9 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   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 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)
@@ -44,7 +44,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   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_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)
@@ -62,14 +62,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
  ${CMAKE_CURRENT_SOURCE_DIR}/cmfree.c 
@@ -81,6 +73,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 
@@ -95,14 +89,8 @@ set(examples_src
  ${CMAKE_CURRENT_SOURCE_DIR}/icm.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/icsplit.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/probe-intercomm.c 
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)