X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/273106067a95b0e3dc65904ff59c87e22522d1aa..87e445c8ad7a9508d561eaf510314d1822a4fe54:/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
index 9ac49c7b90..90782d45e3 100644
--- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/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()
@@ -8,26 +8,20 @@ if(enable_smpi)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
   endif()
 
+  set(CMAKE_INCLUDE_CURRENT_DIR ON)
   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")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/")
+  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
+  add_executable(allpairf allpairf.f)
+#  add_executable(greqf greqf.f dummyf.f)
+#  add_executable(mprobef mprobef.f)
+  add_executable(statusesf statusesf.f)
 
-  add_executable(allpairf allpairf.f ../util/mtestf.f)
-  add_executable(greqf greqf.f dummyf.f ../util/mtestf.f)
-  #add_executable(mprobef mprobef.f ../util/mtestf.f)
-  add_executable(statusesf statusesf.f ../util/mtestf.f)
-
-  target_link_libraries(allpairf  simgrid)
-  target_link_libraries(greqf  simgrid)
-  #target_link_libraries(mprobef  simgrid)
-  target_link_libraries(statusesf  simgrid)
-
- set_target_properties(allpairf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(greqf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- #set_target_properties(mprobef PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
- set_target_properties(statusesf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  target_link_libraries(allpairf simgrid mtest_f77)
+#  target_link_libraries(greqf simgrid mtest_f77)
+  #target_link_libraries(mprobef simgrid mtest_f77)
+  target_link_libraries(statusesf simgrid mtest_f77)
 
 endif()
 
@@ -41,12 +35,12 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/allpairf.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/attr1aints.h 
- ${CMAKE_CURRENT_SOURCE_DIR}/dummyf.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/greqf.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/mprobef.f 
- ${CMAKE_CURRENT_SOURCE_DIR}/statusesf.f 
+  ${CMAKE_CURRENT_SOURCE_DIR}/allpairf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/attr1aints.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/dummyf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/greqf.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/mprobef.f
+  ${CMAKE_CURRENT_SOURCE_DIR}/statusesf.f
   PARENT_SCOPE
   )
 set(bin_files