X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e694957c5830a9f1407392fa7f76796274aa4d18..4a6b0a991a67e6f2f67c03fed43529e078da7115:/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
index 7f5aad9876..74459dc384 100644
--- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND SMPI_F2C)
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
   else()
@@ -9,49 +7,40 @@ if(enable_smpi AND SMPI_F2C)
   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(allredint8f allredint8f.f ../util/mtestf.f)
-  add_executable(allredopttf allredopttf.f ../util/mtestf.f)
-  add_executable(alltoallvf alltoallvf.f ../util/mtestf.f)
-  add_executable(alltoallwf alltoallwf.f ../util/mtestf.f)
-  add_executable(exscanf exscanf.f ../util/mtestf.f)
-  add_executable(inplacef inplacef.f ../util/mtestf.f)
- # add_executable(nonblockingf nonblockingf.f ../util/mtestf.f)
- # add_executable(nonblocking_inpf nonblocking_inpf.f ../util/mtestf.f)
-  add_executable(red_scat_blockf red_scat_blockf.f ../util/mtestf.f)
-  add_executable(redscatf redscatf.f ../util/mtestf.f)
-  add_executable(reducelocalf reducelocalf.f ../util/mtestf.f)
-  add_executable(split_typef split_typef.f ../util/mtestf.f)
-  add_executable(uallreducef uallreducef.f ../util/mtestf.f)
-  add_executable(vw_inplacef vw_inplacef.f ../util/mtestf.f)
-
-  target_link_libraries(allredint8f  simgrid)
-  target_link_libraries(allredopttf  simgrid)
-  target_link_libraries(alltoallvf  simgrid)
-  target_link_libraries(alltoallwf  simgrid)
-  target_link_libraries(exscanf  simgrid)
-  target_link_libraries(inplacef  simgrid)
- # target_link_libraries(nonblockingf  simgrid)
- # target_link_libraries(nonblocking_inpf  simgrid)
-  target_link_libraries(red_scat_blockf  simgrid)
-  target_link_libraries(redscatf  simgrid)
-  target_link_libraries(reducelocalf  simgrid)
-  target_link_libraries(split_typef  simgrid)
-  target_link_libraries(uallreducef  simgrid)
-  target_link_libraries(vw_inplacef  simgrid)
+#  add_executable(allredint8f allredint8f.f)
+#  add_executable(allredopttf allredopttf.f)
+  add_executable(alltoallvf alltoallvf.f)
+#  add_executable(alltoallwf alltoallwf.f)
+  add_executable(exscanf exscanf.f)
+  add_executable(inplacef inplacef.f)
+ # add_executable(nonblockingf nonblockingf.f)
+ # add_executable(nonblocking_inpf nonblocking_inpf.f)
+  add_executable(red_scat_blockf red_scat_blockf.f)
+  add_executable(redscatf redscatf.f)
+  add_executable(reducelocalf reducelocalf.f)
+  add_executable(split_typef split_typef.f)
+  add_executable(uallreducef uallreducef.f)
+  add_executable(vw_inplacef vw_inplacef.f)
 
+#  target_link_libraries(allredint8f simgrid mtest_f77)
+#  target_link_libraries(allredopttf simgrid mtest_f77)
+  target_link_libraries(alltoallvf simgrid mtest_f77)
+#  target_link_libraries(alltoallwf simgrid mtest_f77)
+  target_link_libraries(exscanf simgrid mtest_f77)
+  target_link_libraries(inplacef simgrid mtest_f77)
+ # target_link_libraries(nonblockingf simgrid mtest_f77)
+ # target_link_libraries(nonblocking_inpf simgrid mtest_f77)
+  target_link_libraries(red_scat_blockf simgrid mtest_f77)
+  target_link_libraries(redscatf simgrid mtest_f77)
+  target_link_libraries(reducelocalf simgrid mtest_f77)
+  target_link_libraries(split_typef simgrid mtest_f77)
+  target_link_libraries(uallreducef simgrid mtest_f77)
+  target_link_libraries(vw_inplacef simgrid mtest_f77)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/allredint8f.f
@@ -68,14 +57,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/split_typef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/uallreducef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/vw_inplacef.f
-  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)