X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4137195804cd6cf88d6077d42a80cd6b41e09814..3080c6b0d097d6b3b7d5b3dda0592154ce438f64:/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
index 3766a83ca2..89e3b7db91 100644
--- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
@@ -1,6 +1,6 @@
 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 +9,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")
 
-  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()
 
@@ -37,11 +32,11 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/allpairf90.f90 
- ${CMAKE_CURRENT_SOURCE_DIR}/dummyf90.f90 
- ${CMAKE_CURRENT_SOURCE_DIR}/greqf90.f90 
- ${CMAKE_CURRENT_SOURCE_DIR}/mprobef90.f90 
- ${CMAKE_CURRENT_SOURCE_DIR}/statusesf90.f90 
+  ${CMAKE_CURRENT_SOURCE_DIR}/allpairf90.f90
+  ${CMAKE_CURRENT_SOURCE_DIR}/dummyf90.f90
+  ${CMAKE_CURRENT_SOURCE_DIR}/greqf90.f90
+  ${CMAKE_CURRENT_SOURCE_DIR}/mprobef90.f90
+  ${CMAKE_CURRENT_SOURCE_DIR}/statusesf90.f90
   PARENT_SCOPE
   )
 set(bin_files