Merge branch 'master' of git+ssh://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 598dcf8..95a7b5e 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
@@ -1,6 +1,6 @@
 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,12 +9,12 @@ 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)
-  add_executable(allredopttf90 allredopttf90.f90)
+#  add_executable(allredint8f90 allredint8f90.f90)
+#  add_executable(allredopttf90 allredopttf90.f90)
   add_executable(alltoallvf90 alltoallvf90.f90)
-  add_executable(alltoallwf90 alltoallwf90.f90)
+#  add_executable(alltoallwf90 alltoallwf90.f90)
   add_executable(exscanf90 exscanf90.f90)
   add_executable(inplacef90 inplacef90.f90)
  # add_executable(nonblockingf90 nonblockingf90.f90)
@@ -25,10 +25,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_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(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(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)