X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d93d854c081e2991fcb656250c79121d02295cf..57a4ce6a28d437d6f1b931b9732d9ed584e252cd:/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt?ds=sidebyside

diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
index c0c3f0eb3e..2c3f61956a 100644
--- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi)
+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,21 +7,16 @@ if(enable_smpi)
   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")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(allpairf90 allpairf90.f90 ../util/mtestf90.f90)
-  add_executable(greqf90 greqf90.f90 dummyf90.f90 ../util/mtestf90.f90)
-#  add_executable(mprobef90 mprobef90.f90 ../util/mtestf90.f90)
-  add_executable(statusesf90 statusesf90.f90 ../util/mtestf90.f90)
-  target_link_libraries(allpairf90  simgrid)
-  target_link_libraries(greqf90  simgrid)
-#  target_link_libraries(mprobef90  simgrid)
-  target_link_libraries(statusesf90  simgrid)
-  set_target_properties(allpairf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(greqf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-#  set_target_properties(mprobef90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(statusesf90 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  add_executable(allpairf90 allpairf90.f90)
+#  add_executable(greqf90 greqf90.f90 dummyf90.f90)
+#  add_executable(mprobef90 mprobef90.f90)
+  add_executable(statusesf90 statusesf90.f90)
+  target_link_libraries(allpairf90 simgrid mtest_f90)
+#  target_link_libraries(greqf90 simgrid mtest_f90)
+#  target_link_libraries(mprobef90 simgrid mtest_f90)
+  target_link_libraries(statusesf90 simgrid mtest_f90)
 
 endif()