X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..e3ff580889f5d85e5bdb7a42bad335184bbce0ed:/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 0b7c83630f..ea628372e0 100644
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
+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,46 +6,21 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
   endif()
 
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
-
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
-
-  add_executable(allctypesf allctypesf.f ../util/mtestf.f)
-  add_executable(gaddressf gaddressf.f ../util/mtestf.f)
-  add_executable(hindex1f hindex1f.f ../util/mtestf.f)
-  add_executable(hindexed_blockf hindexed_blockf.f ../util/mtestf.f)
-  add_executable(packef packef.f ../util/mtestf.f)
-  add_executable(typecntsf typecntsf.f ../util/mtestf.f)
-  add_executable(typem2f typem2f.f ../util/mtestf.f)
-  add_executable(typename3f typename3f.f ../util/mtestf.f)
-  add_executable(typenamef typenamef.f ../util/mtestf.f)
-  add_executable(typesnamef typesnamef.f ../util/mtestf.f)
-  add_executable(typesubf typesubf.f ../util/mtestf.f)
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  target_link_libraries(allctypesf  simgrid)
-  target_link_libraries(gaddressf  simgrid)
-  target_link_libraries(hindex1f  simgrid)
-  target_link_libraries(hindexed_blockf  simgrid)
-  target_link_libraries(packef  simgrid)
-  target_link_libraries(typecntsf  simgrid)
-  target_link_libraries(typem2f  simgrid)
-  target_link_libraries(typename3f  simgrid)
-  target_link_libraries(typenamef  simgrid)
-  target_link_libraries(typesnamef  simgrid)
-  target_link_libraries(typesubf  simgrid)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in typeaints.h @ONLY)
 
+  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)	
+  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}/allctypesf.f
@@ -62,15 +35,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typenamef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typesnamef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typesubf.f
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/../util/mtestf.f
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)