Also add the mpich3 binaries in the dependencies of make tests

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

diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
index 3ad68e7..5b2f44a 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/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,58 +6,21 @@ 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(allctypesf90 allctypesf90.f90)
- # add_executable(createf90 createf90.f90)
-  add_executable(gaddressf90 gaddressf90.f90)
- # add_executable(get_elem_d get_elem_d.f90)
- # add_executable(get_elem_u get_elem_u.f90)
-#  add_executable(hindex1f90 hindex1f90.f90)
-#  add_executable(hindexed_blockf90 hindexed_blockf90.f90)
-  add_executable(indtype indtype.f90)
-  add_executable(kinds kinds.f90)
-#  add_executable(packef90 packef90.f90)
- # add_executable(sizeof sizeof.f90)
- # add_executable(structf structf.f90)
- # add_executable(trf90 trf90.f90)
-#  add_executable(typecntsf90 typecntsf90.f90)
-#  add_executable(typem2f90 typem2f90.f90)
-#  add_executable(typename3f90 typename3f90.f90)
-#  add_executable(typenamef90 typenamef90.f90)
-#  add_executable(typesnamef90 typesnamef90.f90)
-#  add_executable(typesubf90 typesubf90.f90)
-#  target_link_libraries(allctypesf90 simgrid mtest_f90)
- # target_link_libraries(createf90 simgrid mtest_f90)
-  target_link_libraries(gaddressf90 simgrid mtest_f90)
- # target_link_libraries(get_elem_d simgrid mtest_f90)
- # target_link_libraries(get_elem_u simgrid mtest_f90)
-#  target_link_libraries(hindex1f90 simgrid mtest_f90)
-#  target_link_libraries(hindexed_blockf90 simgrid mtest_f90)
-  target_link_libraries(indtype simgrid mtest_f90)
-  target_link_libraries(kinds simgrid mtest_f90)
-#  target_link_libraries(packef90 simgrid mtest_f90)
- # target_link_libraries(sizeof simgrid mtest_f90)
- # target_link_libraries(structf simgrid mtest_f90)
- # target_link_libraries(trf90 simgrid mtest_f90)
-#  target_link_libraries(typecntsf90 simgrid mtest_f90)
-#  target_link_libraries(typem2f90 simgrid mtest_f90)
-#  target_link_libraries(typename3f90 simgrid mtest_f90)
-#  target_link_libraries(typenamef90 simgrid mtest_f90)
-#  target_link_libraries(typesnamef90 simgrid mtest_f90)
-#  target_link_libraries(typesubf90 simgrid mtest_f90)
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
+  foreach(test gaddressf90
+             # allctypesf90 createf90 get_elem_d get_elem_u
+            # hindex1f90 hindexed_blockf90 
+              indtype kinds
+            # packef90 sizeof structf trf90 typecntsf90 typem2f90 typename3f90
+            # typenamef90 typesnamef90
+              typesubf90)
+    add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90)
+    add_dependencies(tests ${test})
+    target_link_libraries(${test} simgrid mtest_f90)   
+  endforeach()
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/allctypesf90.f90
@@ -81,14 +42,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typenamef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/typesnamef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/typesubf90.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)