Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / smpi / mpich3-test / f77 / ext / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
index f336884..5026d9b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
@@ -1,6 +1,4 @@
-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,18 +7,16 @@ if(enable_smpi AND SMPI_F2C)
   endif()
 
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-  add_executable(add1size add1size.h ../util/mtestf.f)
-#  add_executable(allocmemf allocmemf.f ../util/mtestf.f)
-#  add_executable(c2f2cf c2f2cf.f c2f2c.c ../util/mtestf.f)
-#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c ../util/mtestf.f)
+#  add_executable(allocmemf allocmemf.f)
+#  add_executable(c2f2cf c2f2cf.f c2f2c.c)
+#  add_executable(ctypesinf ctypesinf.f ctypesfromc.c)
 
-  target_link_libraries(add1size  simgrid)
-#  target_link_libraries(allocmemf  simgrid)
-#  target_link_libraries(c2f2cf  simgrid)
-#  target_link_libraries(ctypesinf  simgrid)
+#  target_link_libraries(allocmemf simgrid mtest_f77)
+#  target_link_libraries(c2f2cf simgrid mtest_f77)
+#  target_link_libraries(ctypesinf simgrid mtest_f77)
 
 endif()