start to shrink mpich3-test cmake files

diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt
index 4e912b9..0bf7c56 100644 (file)
--- a/teshsuite/smpi/mpich3-test/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt
@@ -1,7 +1,4 @@
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
-  PARENT_SCOPE)
+set(bin_files  ${bin_files}  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report  PARENT_SCOPE)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 else()
@@ -13,24 +10,20 @@ else()
     endforeach()
 endif()
 
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
-  ${CMAKE_CURRENT_SOURCE_DIR}/checktests
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_manual.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/f77/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/f90/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/dtypes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h
-  PARENT_SCOPE)
-
+set(txt_files  ${txt_files}  ${CMAKE_CURRENT_SOURCE_DIR}/README
+                             ${CMAKE_CURRENT_SOURCE_DIR}/runtests
+                             ${CMAKE_CURRENT_SOURCE_DIR}/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
+                             ${CMAKE_CURRENT_SOURCE_DIR}/checktests
+                             ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_manual.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/f77/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/f90/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/dtypes.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h                            PARENT_SCOPE)
 
 #build only once files used in each test (C version compiled here at root, F77 is in f77/util, and F90 in F90/util)
 

diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
index 90eba93..7f27b9f 100644 (file)
--- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
@@ -9,65 +9,16 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(attr2type attr2type.c)
-  add_executable(attrend2 attrend2.c)
-  add_executable(attrend attrend.c)
-  add_executable(attrerr attrerr.c)
-  add_executable(attrerrcomm attrerrcomm.c)
-  add_executable(attrerrtype attrerrtype.c)
-#  add_executable(attric attric.c)
-  add_executable(attrorder attrorder.c)
-  add_executable(attrordercomm attrordercomm.c)
-  add_executable(attrordertype attrordertype.c)
-  add_executable(attrt attrt.c)
-  add_executable(baseattr2 baseattr2.c)
-  add_executable(baseattrcomm baseattrcomm.c)
-  add_executable(fkeyval fkeyval.c)
-#  add_executable(fkeyvalcomm fkeyvalcomm.c)
-#  add_executable(fkeyvaltype fkeyvaltype.c)
-#  add_executable(keyval_double_free keyval_double_free.c)
-
-  target_link_libraries(attr2type simgrid mtest_c)
-  target_link_libraries(attrend2 simgrid mtest_c)
-  target_link_libraries(attrend simgrid mtest_c)
-  target_link_libraries(attrerr simgrid mtest_c)
-  target_link_libraries(attrerrcomm simgrid mtest_c)
-  target_link_libraries(attrerrtype simgrid mtest_c)
-#  target_link_libraries(attric simgrid mtest_c)
-  target_link_libraries(attrorder simgrid mtest_c)
-  target_link_libraries(attrordercomm simgrid mtest_c)
-  target_link_libraries(attrordertype simgrid mtest_c)
-  target_link_libraries(attrt simgrid mtest_c)
-  target_link_libraries(baseattr2 simgrid mtest_c)
-  target_link_libraries(baseattrcomm simgrid mtest_c)
-  target_link_libraries(fkeyval simgrid mtest_c)
-#  target_link_libraries(fkeyvalcomm simgrid mtest_c)
-#  target_link_libraries(fkeyvaltype simgrid mtest_c)
-#  target_link_libraries(keyval_double_free simgrid mtest_c)
-
+  foreach(file attr2type attrend2 attrend attrerr attrerrcomm attrerrtype attrorder attrordercomm attrordertype attrt
+          baseattr2 baseattrcomm fkeyval) #attric fkeyvalcomm fkeyvaltype keyval_double_free
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
 endif()
 
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/attr2type.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrend2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrend.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrerr.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrerrcomm.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrerrtype.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attric.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrorder.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrordercomm.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrordertype.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/attrt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/baseattr2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/baseattrcomm.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/fkeyval.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/fkeyvalcomm.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/fkeyvaltype.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/keyval_double_free.c
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file attr2type attrend2 attrend attrerr attrerrcomm attrerrtype attrorder attrordercomm attrordertype attrt
+        baseattr2 baseattrcomm fkeyval attric fkeyvalcomm fkeyvaltype keyval_double_free)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)

diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
index 07b3936..3e8e1c7 100644 (file)
--- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
@@ -9,87 +9,20 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  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 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)
-
+  foreach(file cmfree cmsplit2 cmsplit cmsplit_type commcreate1 comm_create_group comm_group_half comm_group_rand 
+          comm_info ctxalloc ctxsplit dup dup_with_info) 
+    # not compiled files
+    # comm_idup comm_idup_mul comm_idup_overlap commname dupic ic1 ic2 iccreate icgroup icm icsplit probe-intercomm 
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/cmfree.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/cmsplit2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/cmsplit.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/cmsplit_type.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/commcreate1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/comm_create_group.c 
- ${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 
- ${CMAKE_CURRENT_SOURCE_DIR}/ctxsplit.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/dup.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/dupic.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/dup_with_info.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/ic1.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/ic2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/iccreate.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/icgroup.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/icm.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/icsplit.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/probe-intercomm.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file cmfree cmsplit2 cmsplit cmsplit_type commcreate1 comm_create_group comm_group_half comm_group_rand 
+        comm_idup comm_idup_overlap comm_idup_mul comm_info commname ctxalloc ctxsplit dup dupic dup_with_info ic1 ic2 
+        iccreate icgroup icm icsplit probe-intercomm)
+  set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src ${examples_src}                                         PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist   PARENT_SCOPE)

diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
index f5229fc..d50ee7b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
@@ -9,209 +9,37 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   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(contig-zero-count contig-zero-count.c)
-  add_executable(cxx-types cxx-types.c)
-#  add_executable(darray-cyclic darray-cyclic.c)
-#  add_executable(darray-pack darray-pack.c)
-  add_executable(dataalign dataalign.c)
-  add_executable(gaddress gaddress.c)
-#  add_executable(get-elements get-elements.c)
-#  add_executable(get-elements-pairtype get-elements-pairtype.c)
-#  add_executable(getpartelm getpartelm.c)
-#  add_executable(get-struct get-struct.c)
-  add_executable(hindexed_block hindexed_block.c)
-  add_executable(hindexed_block_contents hindexed_block_contents.c)
-#  add_executable(hindexed-zeros hindexed-zeros.c)
-#  add_executable(hvecblklen hvecblklen.c)
-#  add_executable(indexed-misc indexed-misc.c)
-#  add_executable(large-count large-count.c)
-#  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(longdouble longdouble.c)
-#  add_executable(lots-of-types lots-of-types.c)
-#  add_executable(pairtype-pack pairtype-pack.c)
-#  add_executable(pairtype-size-extent pairtype-size-extent.c)
-#  add_executable(segtest segtest.c)
+  foreach(file blockindexed-zero-count contigstruct contig-zero-count cxx-types dataalign gaddress hindexed_block
+          hindexed_block_contents localpack longdouble simple-commit simple-pack simple-resized simple-size-extent
+          struct-derived-zeros struct-ezhov struct-pack struct-verydeep struct-zero-count tfree transpose-pack tresized2
+          tresized typecommit typefree typelb typename unpack zeroblks zeroparms)
+    # not compiled files
+    # blockindexed-misc contents darray-cyclic darray-pack get-elements get-elements-pairtype getpartelm get-struct
+    # hindexed-zeros hvecblklen indexed-misc large-count large_type large_type_sendrec lbub lots-of-type pairtype-pack
+    # pairtype-size-extent segtest simple-pack-external sizedtypes slice-pack slice-pack-external struct-empty-el
+    # struct-no-real-type structpack2 subarray subarray-pack tmatchsize triangular-pack unusual-noncontigs vecblklen
+    # zero-blklen-vector
+    add_executable(${file} ${file}.c)
+    target_link_libraries(${file} simgrid mtest_c)
+  endforeach()
+
   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-external simple-pack-external.c)
-  add_executable(simple-resized simple-resized.c)
-  add_executable(simple-size-extent simple-size-extent.c)
-#  add_executable(sizedtypes sizedtypes.c)
-#  add_executable(slice-pack slice-pack.c)
-#  add_executable(slice-pack-external slice-pack-external.c)
-  add_executable(struct-derived-zeros struct-derived-zeros.c)
-#  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(structpack2 structpack2.c)
-  add_executable(struct-verydeep struct-verydeep.c)
-  add_executable(struct-zero-count struct-zero-count.c)
-#  add_executable(subarray subarray.c)
-#  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(tresized2 tresized2.c)
-  add_executable(tresized tresized.c)
-#  add_executable(triangular-pack triangular-pack.c)
-  add_executable(typecommit typecommit.c)
-  add_executable(typefree typefree.c)
-  add_executable(typelb typelb.c)
-  add_executable(typename typename.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(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(contig-zero-count simgrid mtest_c)
-  target_link_libraries(cxx-types simgrid mtest_c)
-#  target_link_libraries(darray-cyclic simgrid mtest_c)
-#  target_link_libraries(darray-pack simgrid mtest_c)
-  target_link_libraries(dataalign simgrid mtest_c)
-  target_link_libraries(gaddress simgrid mtest_c)
-#  target_link_libraries(get-elements simgrid mtest_c)
-#  target_link_libraries(get-elements-pairtype simgrid mtest_c)
-#  target_link_libraries(getpartelm simgrid mtest_c)
-#  target_link_libraries(get-struct simgrid mtest_c)
-  target_link_libraries(hindexed_block simgrid mtest_c)
-  target_link_libraries(hindexed_block_contents simgrid mtest_c)
-#  target_link_libraries(hindexed-zeros simgrid mtest_c).
-#  target_link_libraries(hvecblklen simgrid mtest_c)
-#  target_link_libraries(indexed-misc simgrid mtest_c)
-#  target_link_libraries(large-count simgrid mtest_c)
-#  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(longdouble simgrid mtest_c)
-#  target_link_libraries(lots-of-types simgrid mtest_c)
-#  target_link_libraries(pairtype-pack simgrid mtest_c)
-#  target_link_libraries(pairtype-size-extent simgrid mtest_c)
-#  target_link_libraries(segtest simgrid mtest_c)
   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-external simgrid mtest_c)
-  target_link_libraries(simple-resized simgrid mtest_c)
-  target_link_libraries(simple-size-extent simgrid mtest_c)
-#  target_link_libraries(sizedtypes simgrid mtest_c)
-#  target_link_libraries(slice-pack simgrid mtest_c)
-#  target_link_libraries(slice-pack-external simgrid mtest_c)
-  target_link_libraries(struct-derived-zeros simgrid mtest_c)
-#  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(structpack2 simgrid mtest_c)
-  target_link_libraries(struct-verydeep simgrid mtest_c)
-  target_link_libraries(struct-zero-count simgrid mtest_c)
-#  target_link_libraries(subarray simgrid mtest_c)
-#  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(tresized2 simgrid mtest_c)
-  target_link_libraries(tresized simgrid mtest_c)
-#  target_link_libraries(triangular-pack simgrid mtest_c)
-  target_link_libraries(typecommit simgrid mtest_c)
-  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(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(zeroparms simgrid mtest_c)
-
 endif()
 
-set(examples_src
-  ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/blockindexed-misc.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/blockindexed-zero-count.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contents.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contigstruct.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/contig-zero-count.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/cxx-types.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/darray-cyclic.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/darray-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/dataalign.c
- ${CMAKE_CURRENT_SOURCE_DIR}/gaddress.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/get-elements.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/get-elements-pairtype.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/getpartelm.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/get-struct.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/hindexed_block.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/hindexed_block_contents.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/hindexed-zeros.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/hvecblklen.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/indexed-misc.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/large-count.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/large_type.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/large_type_sendrec.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lbub.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/localpack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/longdouble.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/lots-of-types.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/pairtype-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/pairtype-size-extent.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/segtest.c
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecvt2.c
- ${CMAKE_CURRENT_SOURCE_DIR}/sendrecvt4.c
- ${CMAKE_CURRENT_SOURCE_DIR}/simple-commit.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/simple-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/simple-pack-external.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/simple-resized.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/simple-size-extent.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/sizedtypes.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/slice-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/slice-pack-external.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-derived-zeros.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-empty-el.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-ezhov.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-no-real-types.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/structpack2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-verydeep.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/struct-zero-count.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/subarray.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/subarray-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/tfree.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/tmatchsize.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/transpose-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/tresized2.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/tresized.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/triangular-pack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/typecommit.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/typefree.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/typelb.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/typename.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/unpack.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/unusual-noncontigs.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/vecblklen.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/zero-blklen-vector.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/zeroblks.c 
- ${CMAKE_CURRENT_SOURCE_DIR}/zeroparms.c 
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE)
+foreach(file blockindexed-misc blockindexed-zero-count contents contigstruct contig-zero-count cxx-types darray-cyclic 
+        darray-pack dataalign gaddress get-elements get-elements-pairtype getpartelm get-struct hindexed_block
+        hindexed_block_contents hindexed-zeros hvecblklen indexed-misc large-count large_type large_type_sendrec lbub
+        localpack longdouble lots-of-types pairtype-pack pairtype-size-extent segtest sendrecvt2 sendrecvt4 
+        simple-commit simple-pack simple-pack-external simple-resized simple-size-extent sizedtypes slice-pack 
+        slice-pack-external struct-derived-zeros struct-empty-el struct-ezhov struct-no-real-types struct-pack 
+        structpack2 struct-verydeep struct-zero-count subarray subarray-pack tfree tmatchsize transpose-pack tresized2
+        tresized triangular-pack typecommit typefree typelb typename unpack unusual-noncontigs vecblklen 
+        zero-blklen-vector zeroblks zeroparms)
+  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+
+set(examples_src  ${examples_src}                                        PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/testlist  PARENT_SCOPE)