X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/363c6561b6288c19d8b6e89882c23814981865b5..347996b4a10c4e8579080692afa60e0afb88b60a:/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 da9f6ac649..fc2942a66e 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 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()
@@ -9,59 +7,36 @@ if(enable_smpi AND SMPI_F2C)
   endif()
 
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  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(typeaints typeaints.h ../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)
-
-  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(typeaints  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 ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
 
-  set_target_properties(allctypesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(gaddressf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindex1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindexed_blockf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(packef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeaints PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typecntsf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typem2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typename3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typenamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesnamef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesubf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#  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)
 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
@@ -69,22 +44,15 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/hindex1f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/hindexed_blockf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/packef.f
-  ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in
   ${CMAKE_CURRENT_SOURCE_DIR}/typecntsf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typem2f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typename3f.f
   ${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)