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

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

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
index b2da152..bdefabe 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
+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,36 +7,36 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   endif()
 
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allredint8f90 allredint8f90.f90 ../util/mtestf90.f90)
-  add_executable(allredopttf90 allredopttf90.f90 ../util/mtestf90.f90)
-  add_executable(alltoallvf90 alltoallvf90.f90 ../util/mtestf90.f90)
-  add_executable(alltoallwf90 alltoallwf90.f90 ../util/mtestf90.f90)
-  add_executable(exscanf90 exscanf90.f90 ../util/mtestf90.f90)
-  add_executable(inplacef90 inplacef90.f90 ../util/mtestf90.f90)
- # add_executable(nonblockingf90 nonblockingf90.f90 ../util/mtestf90.f90)
- # add_executable(nonblocking_inpf90 nonblocking_inpf90.f90 ../util/mtestf90.f90)
-  add_executable(red_scat_blockf90 red_scat_blockf90.f90 ../util/mtestf90.f90)
-  add_executable(redscatf90 redscatf90.f90 ../util/mtestf90.f90)
-  add_executable(reducelocalf90 reducelocalf90.f90 ../util/mtestf90.f90)
-  add_executable(split_typef90 split_typef90.f90 ../util/mtestf90.f90)
-  add_executable(uallreducef90 uallreducef90.f90 ../util/mtestf90.f90)
-  add_executable(vw_inplacef90 vw_inplacef90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allredint8f90  simgrid)
-  target_link_libraries(allredopttf90  simgrid)
-  target_link_libraries(alltoallvf90  simgrid)
-  target_link_libraries(alltoallwf90  simgrid)
-  target_link_libraries(exscanf90  simgrid)
-  target_link_libraries(inplacef90  simgrid)
- # target_link_libraries(nonblockingf90  simgrid)
- # target_link_libraries(nonblocking_inpf90  simgrid)
-  target_link_libraries(red_scat_blockf90  simgrid)
-  target_link_libraries(redscatf90  simgrid)
-  target_link_libraries(reducelocalf90  simgrid)
-  target_link_libraries(split_typef90  simgrid)
-  target_link_libraries(uallreducef90  simgrid)
-  target_link_libraries(vw_inplacef90  simgrid)
+#  add_executable(allredint8f90 allredint8f90.f90)
+#  add_executable(allredopttf90 allredopttf90.f90)
+  add_executable(alltoallvf90 alltoallvf90.f90)
+#  add_executable(alltoallwf90 alltoallwf90.f90)
+  add_executable(exscanf90 exscanf90.f90)
+  add_executable(inplacef90 inplacef90.f90)
+ # add_executable(nonblockingf90 nonblockingf90.f90)
+ # add_executable(nonblocking_inpf90 nonblocking_inpf90.f90)
+  add_executable(red_scat_blockf90 red_scat_blockf90.f90)
+  add_executable(redscatf90 redscatf90.f90)
+  add_executable(reducelocalf90 reducelocalf90.f90)
+  add_executable(split_typef90 split_typef90.f90)
+  add_executable(uallreducef90 uallreducef90.f90)
+  add_executable(vw_inplacef90 vw_inplacef90.f90)
+#  target_link_libraries(allredint8f90  simgrid mtest_f90)
+#  target_link_libraries(allredopttf90  simgrid mtest_f90)
+  target_link_libraries(alltoallvf90  simgrid mtest_f90)
+#  target_link_libraries(alltoallwf90  simgrid mtest_f90)
+  target_link_libraries(exscanf90  simgrid mtest_f90)
+  target_link_libraries(inplacef90  simgrid mtest_f90)
+ # target_link_libraries(nonblockingf90  simgrid mtest_f90)
+ # target_link_libraries(nonblocking_inpf90  simgrid mtest_f90)
+  target_link_libraries(red_scat_blockf90  simgrid mtest_f90)
+  target_link_libraries(redscatf90  simgrid mtest_f90)
+  target_link_libraries(reducelocalf90  simgrid mtest_f90)
+  target_link_libraries(split_typef90  simgrid mtest_f90)
+  target_link_libraries(uallreducef90  simgrid mtest_f90)
+  target_link_libraries(vw_inplacef90  simgrid mtest_f90)
 
 endif()
 
@@ -74,7 +72,6 @@ set(bin_files
   )
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
   )