X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b2b01eff3a1b860aed60642848a6e1000011c22..5ec2b80b686983f84ebab7c7398a29e73286deee:/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
index e7cc14aaec..f6f088d625 100644
--- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
@@ -1,38 +1,25 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
-  if(WIN32)
-    set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
-  else()
-    set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
-    set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
-  endif()
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
+  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+  set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
 
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allpairf allpairf.f)
-#  add_executable(greqf greqf.f dummyf.f)
-  #add_executable(mprobef mprobef.f)
-  add_executable(statusesf statusesf.f)
+  add_executable(allpairf  EXCLUDE_FROM_ALL allpairf.f)
+  if((CMAKE_Fortran_COMPILER_ID MATCHES "GNU") AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "10.0"))
+    set_property(SOURCE allpairf.f PROPERTY COMPILE_FLAGS -std=legacy)
+  endif()
+  add_executable(greqf    EXCLUDE_FROM_ALL greqf.f dummyf.f)
+#  add_executable(mprobef  EXCLUDE_FROM_ALL mprobef.f)
+  add_executable(statusesf EXCLUDE_FROM_ALL statusesf.f)
+  add_dependencies(tests allpairf statusesf) # greqf mprobef
 
   target_link_libraries(allpairf simgrid mtest_f77)
-#  target_link_libraries(greqf simgrid mtest_f77)
+  target_link_libraries(greqf simgrid mtest_f77)
   #target_link_libraries(mprobef simgrid mtest_f77)
   target_link_libraries(statusesf 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}/allpairf.f
@@ -41,14 +28,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/greqf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/mprobef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/statusesf.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)