Remove redefinitions of COMPILE_FLAGS for mpich3-test.

They should be useless now, and having hardcoded values for all these
configure variables was not a good idea.

diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
index 81d0972..cc0da58 100644 (file)
--- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi)
   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")
 
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
@@ -32,7 +31,6 @@ if(enable_smpi)
   add_executable(fkeyvaltype fkeyvaltype.c ../util/mtest.c)
   add_executable(keyval_double_free keyval_double_free.c ../util/mtest.c)
 
-
   target_link_libraries(attr2type  simgrid)
   target_link_libraries(attrend2 simgrid)
   target_link_libraries(attrend simgrid)
@@ -51,25 +49,6 @@ if(enable_smpi)
   target_link_libraries(fkeyvaltype simgrid)
   target_link_libraries(keyval_double_free simgrid)
 
-
-  set_target_properties(attr2type  PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrend2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrend PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrerrcomm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrerrtype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attric PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrorder PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrordercomm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrordertype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(attrt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattr2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattrcomm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(fkeyval PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(fkeyvalcomm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(fkeyvaltype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(keyval_double_free PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
index 777eb88..23f0b3d 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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 -Wno-error=unused-variable ")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(allgather2 allgather2.c ../util/mtest.c)
   add_executable(allgather3 allgather3.c ../util/mtest.c)
   add_executable(allgatherv2 allgatherv2.c ../util/mtest.c)
@@ -104,8 +102,6 @@ if(enable_smpi)
   add_executable(scatterv scatterv.c ../util/mtest.c)
   add_executable(uoplong uoplong.c ../util/mtest.c)
 
-
-
   target_link_libraries(allgather2  simgrid)
   target_link_libraries(allgather3  simgrid)
   target_link_libraries(allgatherv2  simgrid)
@@ -196,98 +192,6 @@ if(enable_smpi)
   target_link_libraries(scatterv  simgrid)
   target_link_libraries(uoplong  simgrid)
 
-
-
- set_target_properties(allgather2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allgather3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allgatherv2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allgatherv3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allgatherv4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allred2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allred3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allred4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allred5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allred6 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(allred PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(allredmany PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoall1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoallv0 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoallv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoallw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoallw2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(alltoallw_zeros PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bcast2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bcast3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bcasttest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bcastzerotype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll10 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll11 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll12 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll13 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll6 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll7 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll8 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(coll9 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exscan2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exscan PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gather2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gather2_save PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gather PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(iallred PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(ibarrier PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icallgather PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icallgatherv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icallreduce PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icalltoall PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icalltoallv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icalltoallw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icbarrier PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icbcast PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icgather PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icgatherv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icreduce PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icscatter PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icscatterv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(longuser PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(nonblocking2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(nonblocking3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(nonblocking PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opband PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opbor PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opbxor PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(op_commutative PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opland PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(oplor PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(oplxor PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opmax PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opmaxloc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opmin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opminloc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opprod PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(opsum PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(red3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(red4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscat2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscat3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscatbkinter PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscatblk3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(red_scat_block2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(red_scat_block PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscat PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(redscatinter PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(reduce_mpich PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(reduce_local PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scantst PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scatter2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scatter3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scattern PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scatterv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(uoplong PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
index b4b4e9f..aae539a 100644 (file)
--- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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")
   include_directories("${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)
@@ -62,30 +60,6 @@ if(enable_smpi)
   target_link_libraries(icsplit  simgrid)
   target_link_libraries(probe-intercomm  simgrid)
 
- set_target_properties(cmfree PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(cmsplit2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(cmsplit PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(cmsplit_type PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(commcreate1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(comm_create_group PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(comm_group_half PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(comm_group_rand PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(comm_idup PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(comm_info PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(commname PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(ctxalloc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(ctxsplit PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(dup PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(dupic PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(dup_with_info PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(ic1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(ic2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(iccreate PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icgroup PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icsplit PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(probe-intercomm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
index 02f6a72..093822c 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(blockindexed-misc blockindexed-misc.c ../util/mtest.c)
   add_executable(blockindexed-zero-count blockindexed-zero-count.c ../util/mtest.c)
   add_executable(contents contents.c ../util/mtest.c)
@@ -70,8 +68,6 @@ if(enable_smpi)
   add_executable(zeroblks zeroblks.c ../util/mtest.c)
   add_executable(zeroparms zeroparms.c ../util/mtest.c)
 
-
-
   target_link_libraries(blockindexed-misc  simgrid)
   target_link_libraries(blockindexed-zero-count  simgrid)
   target_link_libraries(contents  simgrid)
@@ -128,64 +124,6 @@ if(enable_smpi)
   target_link_libraries(zeroblks  simgrid)
   target_link_libraries(zeroparms  simgrid)
 
-
-
- set_target_properties(blockindexed-misc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(blockindexed-zero-count PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(contents PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(contigstruct PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(contig-zero-count PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(cxx-types PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(darray-cyclic PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(darray-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gaddress PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(get-elements PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(get-elements-pairtype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(getpartelm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(hindexed_block PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(hindexed_block_contents PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(hindexed-zeros PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(indexed-misc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(large-count PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS} -Wno-error=implicit-function-declaration")
- set_target_properties(lbub PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(localpack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(longdouble PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(lots-of-types PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(pairtype-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(pairtype-size-extent PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(simple-commit PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(simple-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(simple-pack-external PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(simple-resized PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(simple-size-extent PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sizedtypes PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(slice-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(slice-pack-external PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-derived-zeros PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-empty-el PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-ezhov PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-no-real-types PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-verydeep PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(struct-zero-count PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(subarray PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(subarray-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(tfree PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(tmatchsize PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(transpose-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(tresized2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(tresized PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(triangular-pack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(typecommit PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(typefree PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(typelb PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(typename PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(unpack PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(unusual-noncontigs PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(zero-blklen-vector PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(zeroblks PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(zeroparms PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
index c19c489..9a21317 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/")
 
@@ -33,16 +32,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(typeattr3f  simgrid)
   target_link_libraries(typeattrf  simgrid)
 
-  set_target_properties(attrmpi1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
index 00b74e5..7f5aad9 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
@@ -43,21 +42,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(uallreducef  simgrid)
   target_link_libraries(vw_inplacef  simgrid)
 
-  set_target_properties(allredint8f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(allredopttf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(alltoallvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(alltoallwf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(exscanf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(nonblockingf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(nonblocking_inpf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(red_scat_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(redscatf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(reducelocalf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(split_typef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(uallreducef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(vw_inplacef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
index 3d93a58..80bbfe2 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
@@ -9,20 +9,15 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
  # add_executable(commerrf commerrf.f ../util/mtestf.f)
   add_executable(commnamef commnamef.f ../util/mtestf.f)
 
  # target_link_libraries(commerrf  simgrid)
   target_link_libraries(commnamef  simgrid)
 
-# set_target_properties(commerrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
index da9f6ac..c333933 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
@@ -39,19 +38,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(typesnamef  simgrid)
   target_link_libraries(typesubf  simgrid)
 
-  set_target_properties(allctypesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(gaddressf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindex1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindexed_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(packef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeaints PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typecntsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typem2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typename3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typenamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesubf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
index 8c581f8..f336884 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(add1size add1size.h ../util/mtestf.f)
 #  add_executable(allocmemf allocmemf.f ../util/mtestf.f)
 #  add_executable(c2f2cf c2f2cf.f c2f2c.c ../util/mtestf.f)
@@ -24,11 +22,6 @@ if(enable_smpi AND SMPI_F2C)
 #  target_link_libraries(c2f2cf  simgrid)
 #  target_link_libraries(ctypesinf  simgrid)
 
- set_target_properties(add1size PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(allocmemf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(c2f2cf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(ctypesinf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
index 58f7b11..50a6884 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
@@ -9,13 +9,11 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
   add_executable(baseenvf baseenvf.f ../util/mtestf.f)
   target_link_libraries(baseenvf  simgrid)
-  set_target_properties(baseenvf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 
 endif()
 

diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
index ceb2d0b..114e424 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
@@ -10,11 +10,9 @@ if(enable_smpi AND SMPI_F2C)
 
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
   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  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(allpairf allpairf.f ../util/mtestf.f)
   add_executable(greqf greqf.f dummyf.f ../util/mtestf.f)
   #add_executable(mprobef mprobef.f ../util/mtestf.f)
@@ -25,11 +23,6 @@ if(enable_smpi AND SMPI_F2C)
   #target_link_libraries(mprobef  simgrid)
   target_link_libraries(statusesf  simgrid)
 
- set_target_properties(allpairf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(greqf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- #set_target_properties(mprobef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(statusesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
index 23601c4..361f481 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
   add_executable(allredint8f90 allredint8f90.f90 ../util/mtestf90.f90)
@@ -40,20 +39,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(split_typef90  simgrid)
   target_link_libraries(uallreducef90  simgrid)
   target_link_libraries(vw_inplacef90  simgrid)
-  set_target_properties(allredint8f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(allredopttf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(alltoallvf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(alltoallwf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(exscanf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(inplacef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(nonblockingf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(nonblocking_inpf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(red_scat_blockf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(redscatf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(reducelocalf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(split_typef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(uallreducef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(vw_inplacef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 
 endif()
 

diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
index ee9ac50..0b7406d 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
   add_executable(allctypesf90 allctypesf90.f90 ../util/mtestf90.f90)
@@ -50,25 +49,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(typenamef90  simgrid)
   target_link_libraries(typesnamef90  simgrid)
   target_link_libraries(typesubf90  simgrid)
-  set_target_properties(allctypesf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(createf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(gaddressf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(get_elem_d PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(get_elem_u PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindex1f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindexed_blockf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(indtype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(kinds PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(packef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(sizeof PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(structf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(trf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typecntsf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typem2f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typename3f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typenamef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesnamef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesubf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 
 endif()
 

diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
index 06f3338..7234ddb 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
@@ -9,12 +9,10 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
   add_executable(baseenvf90 baseenvf90.f90 ../util/mtestf90.f90)
   target_link_libraries(baseenvf90  simgrid)
-  set_target_properties(baseenvf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 
 endif()
 

diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
index 53dbe4e..65f99ff 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
@@ -9,7 +9,6 @@ if(enable_smpi AND SMPI_F2C)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
   add_executable(allpairf90 allpairf90.f90 ../util/mtestf90.f90)
@@ -20,10 +19,6 @@ if(enable_smpi AND SMPI_F2C)
   target_link_libraries(greqf90  simgrid)
 #  target_link_libraries(mprobef90  simgrid)
   target_link_libraries(statusesf90  simgrid)
-  set_target_properties(allpairf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(greqf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(mprobef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(statusesf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 
 endif()
 

diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
index e80885f..f801d34 100644 (file)
--- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(groupcreate groupcreate.c ../util/mtest.c)
   add_executable(groupnullincl groupnullincl.c ../util/mtest.c)
   add_executable(grouptest2 grouptest2.c ../util/mtest.c)
@@ -21,8 +19,6 @@ if(enable_smpi)
   add_executable(gtranks gtranks.c ../util/mtest.c)
   add_executable(gtranksperf gtranksperf.c ../util/mtest.c)
 
-
-
   target_link_libraries(groupcreate  simgrid)
   target_link_libraries(groupnullincl  simgrid)
   target_link_libraries(grouptest2  simgrid)
@@ -30,15 +26,6 @@ if(enable_smpi)
   target_link_libraries(gtranks  simgrid)
   target_link_libraries(gtranksperf  simgrid)
 
-
-
- set_target_properties(groupcreate PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(groupnullincl PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(grouptest2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(grouptest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gtranks PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(gtranksperf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
index 4f24eea..c9696b3 100644 (file)
--- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(attrself attrself.c ../util/mtest.c)
   add_executable(exitst1 exitst1.c ../util/mtest.c)
   add_executable(exitst2 exitst2.c ../util/mtest.c)
@@ -24,8 +22,6 @@ if(enable_smpi)
   add_executable(timeout timeout.c ../util/mtest.c)
   add_executable(version version.c ../util/mtest.c)
 
-
-
   target_link_libraries(attrself  simgrid)
   target_link_libraries(exitst1  simgrid)
   target_link_libraries(exitst2  simgrid)
@@ -36,18 +32,6 @@ if(enable_smpi)
   target_link_libraries(timeout  simgrid)
   target_link_libraries(version  simgrid)
 
-
-
- set_target_properties(attrself PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(exitst3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(finalized PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(initstat PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(library_version PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(timeout PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(version PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
index 5d5d7d7..d00d710 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
@@ -9,11 +9,9 @@ if(enable_smpi)
   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  -Wno-error=unused-variable")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(anyall anyall.c ../util/mtest.c)
   add_executable(bottom bottom.c ../util/mtest.c)
   add_executable(bsend1 bsend1.c ../util/mtest.c)
@@ -51,8 +49,6 @@ if(enable_smpi)
   add_executable(waitany-null waitany-null.c ../util/mtest.c)
   add_executable(waittestnull waittestnull.c ../util/mtest.c)
 
-
-
   target_link_libraries(anyall  simgrid)
   target_link_libraries(bottom  simgrid)
   target_link_libraries(bsend1  simgrid)
@@ -90,45 +86,6 @@ if(enable_smpi)
   target_link_libraries(waitany-null  simgrid)
   target_link_libraries(waittestnull  simgrid)
 
-
-
- set_target_properties(anyall PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bottom PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsend1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsend2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsend3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsend4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsend5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsendalign PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsendfrag PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(bsendpending PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(cancelrecv PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(eagerdt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(greq1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(icsend PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(inactivereq PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(isendself PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(isendselfprobe PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(large_message PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(mprobe PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(pingping PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(probenull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(probe-unexp PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(pscancel PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(rcancel PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(rqfreeb PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(rqstatus PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scancel2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(scancel PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendall PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendflood PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendrecv1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendrecv2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendrecv3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(sendself PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(waitany-null PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(waittestnull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
 set(tesh_files