X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89d98a56977c70b61c8dba09f5c5136e73784339..dccf1b41e9c7b5a696f01abceaa2779fe65f154f:/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt?ds=sidebyside

diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
index 46e9d881d7..013b1c2925 100644
--- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite 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()
@@ -8,40 +6,30 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
   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(attrmpi1f attrmpi1f.f ../util/mtestf.f)
-  add_executable(baseattr2f baseattr2f.f ../util/mtestf.f)
-  add_executable(baseattrf baseattrf.f ../util/mtestf.f)
-  add_executable(commattr2f commattr2f.f ../util/mtestf.f)
-  add_executable(commattr3f commattr3f.f ../util/mtestf.f)
-  add_executable(commattrf commattrf.f  ../util/mtestf.f)
-  add_executable(typeattr2f typeattr2f.f  ../util/mtestf.f)
-  add_executable(typeattr3f typeattr3f.f  ../util/mtestf.f)
-  add_executable(typeattrf typeattrf.f  ../util/mtestf.f)
-
-  target_link_libraries(attrmpi1f  simgrid)
-  target_link_libraries(baseattr2f  simgrid)
-  target_link_libraries(baseattrf  simgrid)
-  target_link_libraries(commattr2f  simgrid)
-  target_link_libraries(commattr3f  simgrid)
-  target_link_libraries(commattrf  simgrid)
-  target_link_libraries(typeattr2f  simgrid)
-  target_link_libraries(typeattr3f  simgrid)
-  target_link_libraries(typeattrf  simgrid)
+  add_executable(attrmpi1f attrmpi1f.f)
+  add_executable(baseattr2f baseattr2f.f)
+  add_executable(baseattrf baseattrf.f)
+  add_executable(commattr2f commattr2f.f)
+  add_executable(commattr3f commattr3f.f)
+  add_executable(commattrf commattrf.f )
+  add_executable(typeattr2f typeattr2f.f )
+  add_executable(typeattr3f typeattr3f.f )
+  add_executable(typeattrf typeattrf.f )
 
+  target_link_libraries(attrmpi1f simgrid mtest_f77)
+  target_link_libraries(baseattr2f simgrid mtest_f77)
+  target_link_libraries(baseattrf simgrid mtest_f77)
+  target_link_libraries(commattr2f simgrid mtest_f77)
+  target_link_libraries(commattr3f simgrid mtest_f77)
+  target_link_libraries(commattrf simgrid mtest_f77)
+  target_link_libraries(typeattr2f simgrid mtest_f77)
+  target_link_libraries(typeattr3f simgrid mtest_f77)
+  target_link_libraries(typeattrf 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}/attraints.h
@@ -55,13 +43,9 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattr3f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattrf.f
   PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
-  )
+)