X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b4e20873a7bd405842f3d8d1e6dd1d518db5535..1a4fbd7770910a461be806b05bff0dfdf9a87e5e:/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
index dfed73b875..5045e564fd 100644
--- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/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()
@@ -8,28 +6,18 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
   endif()
 
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-
-  add_executable(allpairf90 allpairf90.f90 ../util/mtestf90.f90)
-  add_executable(greqf90 greqf90.f90 dummyf90.f90 ../util/mtestf90.f90)
-#  add_executable(mprobef90 mprobef90.f90 ../util/mtestf90.f90)
-  add_executable(statusesf90 statusesf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allpairf90  simgrid)
-  target_link_libraries(greqf90  simgrid)
-#  target_link_libraries(mprobef90  simgrid)
-  target_link_libraries(statusesf90  simgrid)
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
+  add_executable(allpairf90 allpairf90.f90)
+#  add_executable(greqf90 greqf90.f90 dummyf90.f90)
+#  add_executable(mprobef90 mprobef90.f90)
+  add_executable(statusesf90 statusesf90.f90)
+  target_link_libraries(allpairf90 simgrid mtest_f90)
+#  target_link_libraries(greqf90 simgrid mtest_f90)
+#  target_link_libraries(mprobef90 simgrid mtest_f90)
+  target_link_libraries(statusesf90 simgrid mtest_f90)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/allpairf90.f90
@@ -37,14 +25,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/greqf90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/mprobef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/statusesf90.f90
-  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)