X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9c9e08948a8387e9e8ecb0fe67ab6b94ec2a66f..cf108868b4eeed4d0d9d343bc68557d7814e18c0:/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
index 07f062784d..720c4735fc 100644
--- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 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")
@@ -9,7 +7,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   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(winaccf90 winaccf90.f90)
@@ -19,10 +17,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  add_executable(baseattrwinf90 baseattrwinf90.f90)
 #  add_executable(winattr2f90 winattr2f90.f90)
 #  add_executable(winattrf90 winattrf90.f90)
-#  add_executable(c2f2cwinf90 c2f2cwinf90.f90 c2f2cwin.c)
+  add_executable(c2f2cwinf90 c2f2cwinf90.f90 c2f902cwin.c)
   add_executable(wingetf90 wingetf90.f90)
   add_executable(winnamef90 winnamef90.f90)
-#  add_executable(winscale1f90 winscale1f90.f90)
+  add_executable(winscale1f90 winscale1f90.f90)
 #  add_executable(winscale2f90 winscale2f90.f90)
 
 target_link_libraries(winaccf90 simgrid mtest_f90)
@@ -30,25 +28,15 @@ target_link_libraries(winaccf90 simgrid mtest_f90)
 target_link_libraries(winfencef90 simgrid mtest_f90)
 #target_link_libraries(wingroupf90 simgrid mtest_f90)
 #target_link_libraries(baseattrwinf90 simgrid mtest_f90)
-#target_link_libraries(c2f2cwinf90 simgrid mtest_f90)
+target_link_libraries(c2f2cwinf90 simgrid mtest_f90)
 #target_link_libraries(winattr2f90 simgrid mtest_f90)
 #target_link_libraries(winattrf90 simgrid mtest_f90)
 target_link_libraries(wingetf90 simgrid mtest_f90)
 target_link_libraries(winnamef90 simgrid mtest_f90)
-#target_link_libraries(winscale1f90 simgrid mtest_f90)
+target_link_libraries(winscale1f90 simgrid mtest_f90)
 #target_link_libraries(winscale2f90 simgrid mtest_f90)
-
-
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/winaccf90.f90
@@ -65,14 +53,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/winnamef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale1f90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale2f90.f90
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)