Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / smpi / mpich3-test / datatype / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
index 8f4b6c4..5a26dcb 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/datatype/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,13 +7,13 @@ 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(blockindexed-misc blockindexed-misc.c)
   add_executable(blockindexed-zero-count blockindexed-zero-count.c)
 #  add_executable(contents contents.c)
-#  add_executable(contigstruct contigstruct.c)
+  add_executable(contigstruct contigstruct.c)
   add_executable(contig-zero-count contig-zero-count.c)
   add_executable(cxx-types cxx-types.c)
 #  add_executable(darray-cyclic darray-cyclic.c)
@@ -35,7 +33,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(large_type large_type.c)
 #  add_executable(large_type_sendrec large_type_sendrec.c)
 #  add_executable(lbub lbub.c)
-#  add_executable(localpack localpack.c)
+  add_executable(localpack localpack.c)
   add_executable(longdouble longdouble.c)
 #  add_executable(lots-of-types lots-of-types.c)
 #  add_executable(pairtype-pack pairtype-pack.c)
@@ -44,7 +42,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(sendrecvt2 ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt2.c)
   add_executable(sendrecvt4 ${CMAKE_CURRENT_SOURCE_DIR}/../util/dtypes.c sendrecvt4.c)
   add_executable(simple-commit simple-commit.c)
-#  add_executable(simple-pack simple-pack.c)
+  add_executable(simple-pack simple-pack.c)
 #  add_executable(simple-pack-external simple-pack-external.c)
   add_executable(simple-resized simple-resized.c)
   add_executable(simple-size-extent simple-size-extent.c)
@@ -55,7 +53,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(struct-empty-el struct-empty-el.c)
   add_executable(struct-ezhov struct-ezhov.c)
 #  add_executable(struct-no-real-types struct-no-real-types.c)
-#  add_executable(struct-pack struct-pack.c)
+  add_executable(struct-pack struct-pack.c)
 #  add_executable(structpack2 structpack2.c)
   add_executable(struct-verydeep struct-verydeep.c)
   add_executable(struct-zero-count struct-zero-count.c)
@@ -63,7 +61,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(subarray-pack subarray-pack.c)
   add_executable(tfree tfree.c)
 #  add_executable(tmatchsize tmatchsize.c)
-#  add_executable(transpose-pack transpose-pack.c)
+  add_executable(transpose-pack transpose-pack.c)
   add_executable(tresized2 tresized2.c)
   add_executable(tresized tresized.c)
 #  add_executable(triangular-pack triangular-pack.c)
@@ -71,17 +69,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(typefree typefree.c)
   add_executable(typelb typelb.c)
   add_executable(typename typename.c)
-#  add_executable(unpack unpack.c)
+  add_executable(unpack unpack.c)
 #  add_executable(unusual-noncontigs unusual-noncontigs.c)
 #  add_executable(vecblklen vecblklen.c)
 #  add_executable(zero-blklen-vector zero-blklen-vector.c)
-#  add_executable(zeroblks zeroblks.c)
+  add_executable(zeroblks zeroblks.c)
   add_executable(zeroparms zeroparms.c)
 
 #  target_link_libraries(blockindexed-misc simgrid mtest_c)
   target_link_libraries(blockindexed-zero-count simgrid mtest_c)
 #  target_link_libraries(contents simgrid mtest_c)
-#  target_link_libraries(contigstruct simgrid mtest_c)
+  target_link_libraries(contigstruct simgrid mtest_c)
   target_link_libraries(contig-zero-count simgrid mtest_c)
   target_link_libraries(cxx-types simgrid mtest_c)
 #  target_link_libraries(darray-cyclic simgrid mtest_c)
@@ -101,7 +99,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(large_type simgrid mtest_c)
 #  target_link_libraries(large_type_sendrec simgrid mtest_c)
 #  target_link_libraries(lbub simgrid mtest_c)
-#  target_link_libraries(localpack simgrid mtest_c)
+  target_link_libraries(localpack simgrid mtest_c)
   target_link_libraries(longdouble simgrid mtest_c)
 #  target_link_libraries(lots-of-types simgrid mtest_c)
 #  target_link_libraries(pairtype-pack simgrid mtest_c)
@@ -110,7 +108,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(sendrecvt2 simgrid mtest_c)
   target_link_libraries(sendrecvt4 simgrid mtest_c)
   target_link_libraries(simple-commit simgrid mtest_c)
-#  target_link_libraries(simple-pack simgrid mtest_c)
+  target_link_libraries(simple-pack simgrid mtest_c)
 #  target_link_libraries(simple-pack-external simgrid mtest_c)
   target_link_libraries(simple-resized simgrid mtest_c)
   target_link_libraries(simple-size-extent simgrid mtest_c)
@@ -121,7 +119,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(struct-empty-el simgrid mtest_c)
   target_link_libraries(struct-ezhov simgrid mtest_c)
 #  target_link_libraries(struct-no-real-types simgrid mtest_c)
-#  target_link_libraries(struct-pack simgrid mtest_c)
+  target_link_libraries(struct-pack simgrid mtest_c)
 #  target_link_libraries(structpack2 simgrid mtest_c)
   target_link_libraries(struct-verydeep simgrid mtest_c)
   target_link_libraries(struct-zero-count simgrid mtest_c)
@@ -129,7 +127,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(subarray-pack simgrid mtest_c)
   target_link_libraries(tfree simgrid mtest_c)
 #  target_link_libraries(tmatchsize simgrid mtest_c)
-#  target_link_libraries(transpose-pack simgrid mtest_c)
+  target_link_libraries(transpose-pack simgrid mtest_c)
   target_link_libraries(tresized2 simgrid mtest_c)
   target_link_libraries(tresized simgrid mtest_c)
 #  target_link_libraries(triangular-pack simgrid mtest_c)
@@ -137,11 +135,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(typefree simgrid mtest_c)
   target_link_libraries(typelb simgrid mtest_c)
   target_link_libraries(typename simgrid mtest_c)
-#  target_link_libraries(unpack simgrid mtest_c)
+  target_link_libraries(unpack simgrid mtest_c)
 #  target_link_libraries(unusual-noncontigs simgrid mtest_c)
 #  target_link_libraries(vecblklen simgrid mtest_c)
 #  target_link_libraries(zero-blklen-vector simgrid mtest_c)
-#  target_link_libraries(zeroblks simgrid mtest_c)
+  target_link_libraries(zeroblks simgrid mtest_c)
   target_link_libraries(zeroparms simgrid mtest_c)
 
 endif()