Also add the mpich3 binaries in the dependencies of make tests

[simgrid.git] / 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 3af650c..3e1bb3e 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/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()
@@ -8,54 +6,31 @@ if(enable_smpi)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
   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 -g")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-  include_directories("${CMAKE_CURRENT_BINARY_DIR}/../include/")
-
-
-  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(CMAKE_INCLUDE_CURRENT_DIR ON)
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
- 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}")
+  add_executable(allpairf  EXCLUDE_FROM_ALL allpairf.f)
+#  add_executable(greqf    EXCLUDE_FROM_ALL greqf.f dummyf.f)
+#  add_executable(mprobef  EXCLUDE_FROM_ALL mprobef.f)
+  add_executable(statusesf EXCLUDE_FROM_ALL statusesf.f)
+  add_dependencies(tests allpairf statusesf) # greqf mprobef
 
+  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()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 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 
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+  ${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(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)