Kill f2c. Finally. I hope.

[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 ee9ac50..d5c02d2 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
@@ -1,6 +1,6 @@
 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,66 +9,46 @@ 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")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allctypesf90 allctypesf90.f90 ../util/mtestf90.f90)
- # add_executable(createf90 createf90.f90 ../util/mtestf90.f90)
-  add_executable(gaddressf90 gaddressf90.f90 ../util/mtestf90.f90)
- # add_executable(get_elem_d get_elem_d.f90 ../util/mtestf90.f90)
- # add_executable(get_elem_u get_elem_u.f90 ../util/mtestf90.f90)
-  add_executable(hindex1f90 hindex1f90.f90 ../util/mtestf90.f90)
-  add_executable(hindexed_blockf90 hindexed_blockf90.f90 ../util/mtestf90.f90)
-  add_executable(indtype indtype.f90 ../util/mtestf90.f90)
-  add_executable(kinds kinds.f90 ../util/mtestf90.f90)
-  add_executable(packef90 packef90.f90 ../util/mtestf90.f90)
- # add_executable(sizeof sizeof.f90 ../util/mtestf90.f90)
- # add_executable(structf structf.f90 ../util/mtestf90.f90)
- # add_executable(trf90 trf90.f90 ../util/mtestf90.f90)
-  add_executable(typecntsf90 typecntsf90.f90 ../util/mtestf90.f90)
-  add_executable(typem2f90 typem2f90.f90 ../util/mtestf90.f90)
-  add_executable(typename3f90 typename3f90.f90 ../util/mtestf90.f90)
-  add_executable(typenamef90 typenamef90.f90 ../util/mtestf90.f90)
-  add_executable(typesnamef90 typesnamef90.f90 ../util/mtestf90.f90)
-  add_executable(typesubf90 typesubf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allctypesf90  simgrid)
- # target_link_libraries(createf90  simgrid)
-  target_link_libraries(gaddressf90  simgrid)
- # target_link_libraries(get_elem_d  simgrid)
- # target_link_libraries(get_elem_u  simgrid)
-  target_link_libraries(hindex1f90  simgrid)
-  target_link_libraries(hindexed_blockf90  simgrid)
-  target_link_libraries(indtype  simgrid)
-  target_link_libraries(kinds  simgrid)
-  target_link_libraries(packef90  simgrid)
- # target_link_libraries(sizeof  simgrid)
- # target_link_libraries(structf  simgrid)
- # target_link_libraries(trf90  simgrid)
-  target_link_libraries(typecntsf90  simgrid)
-  target_link_libraries(typem2f90  simgrid)
-  target_link_libraries(typename3f90  simgrid)
-  target_link_libraries(typenamef90  simgrid)
-  target_link_libraries(typesnamef90  simgrid)
-  target_link_libraries(typesubf90  simgrid)
-  set_target_properties(allctypesf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(createf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(gaddressf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(get_elem_d PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(get_elem_u PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindex1f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(hindexed_blockf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(indtype PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(kinds PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(packef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(sizeof PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(structf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- # set_target_properties(trf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typecntsf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typem2f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typename3f90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typenamef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesnamef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typesubf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+#  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)
 
 endif()