X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d51a876f765fc68b3e1e667f867b91a1b4987a85..17fb4b64f0bfb6f25debbcbdf4577812284e6e9e:/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
index 26b871a879..615b08a68f 100644
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
@@ -1,39 +1,23 @@
-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()
-    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_testsuite_smpi_MPICH3 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")
 
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in typeaints.h @ONLY)
 
-#  add_executable(allctypesf allctypesf.f)
-  add_executable(gaddressf gaddressf.f)
-#  add_executable(hindex1f hindex1f.f)
-#  add_executable(hindexed_blockf hindexed_blockf.f)
-#  add_executable(packef packef.f)
-#  add_executable(typecntsf typecntsf.f)
-#  add_executable(typem2f typem2f.f)
-#  add_executable(typename3f typename3f.f)
-#  add_executable(typenamef typenamef.f)
-#  add_executable(typesnamef typesnamef.f)
-#  add_executable(typesubf typesubf.f)
-
-#  target_link_libraries(allctypesf simgrid mtest_f77)
-  target_link_libraries(gaddressf simgrid mtest_f77)
-#  target_link_libraries(hindex1f simgrid mtest_f77)
-#  target_link_libraries(hindexed_blockf simgrid mtest_f77)
-#  target_link_libraries(packef simgrid mtest_f77)
-#  target_link_libraries(typecntsf simgrid mtest_f77)
-#  target_link_libraries(typem2f simgrid mtest_f77)
-#  target_link_libraries(typename3f simgrid mtest_f77)
-#  target_link_libraries(typenamef simgrid mtest_f77)
-#  target_link_libraries(typesnamef simgrid mtest_f77)
-#  target_link_libraries(typesubf simgrid mtest_f77)
+  foreach(test gaddressf
+             allctypesf hindex1f hindexed_blockf packef typecntsf
+             typem2f typename3f typenamef typesnamef
+             typesubf)
+    add_executable(${test} EXCLUDE_FROM_ALL ${test}.f)
+    add_dependencies(tests ${test})
+    target_link_libraries(${test} simgrid mtest_f77)
+    if((CMAKE_Fortran_COMPILER_ID MATCHES "GNU") AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "10.0"))
+      set_property(SOURCE ${test}.f PROPERTY COMPILE_FLAGS -std=legacy)
+    endif()
+  endforeach()
 endif()
 
 set(examples_src