Merge pull request #2 from mquinson/master

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

diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
index 4a23dcb..d5b57fd 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/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(winaccf winaccf.f)
@@ -19,10 +17,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  add_executable(baseattrwinf baseattrwinf.f)
 #  add_executable(winattr2f winattr2f.f)
 #  add_executable(winattrf winattrf.f)
-#  add_executable(c2f2cwinf c2f2cwinf.f c2f2cwin.c)
+  add_executable(c2f2cwinf c2f2cwinf.f c2f2cwin.c)
   add_executable(wingetf wingetf.f)
   add_executable(winnamef winnamef.f)
-#  add_executable(winscale1f winscale1f.f)
+  add_executable(winscale1f winscale1f.f)
 #  add_executable(winscale2f winscale2f.f)
 
 target_link_libraries(winaccf simgrid mtest_f77)
@@ -30,25 +28,15 @@ target_link_libraries(winaccf simgrid mtest_f77)
 target_link_libraries(winfencef simgrid mtest_f77)
 #target_link_libraries(wingroupf simgrid mtest_f77)
 #target_link_libraries(baseattrwinf simgrid mtest_f77)
-#target_link_libraries(c2f2cwinf simgrid mtest_f77)
+target_link_libraries(c2f2cwinf simgrid mtest_f77)
 #target_link_libraries(winattr2f simgrid mtest_f77)
 #target_link_libraries(winattrf simgrid mtest_f77)
 target_link_libraries(wingetf simgrid mtest_f77)
 target_link_libraries(winnamef simgrid mtest_f77)
-#target_link_libraries(winscale1f simgrid mtest_f77)
+target_link_libraries(winscale1f simgrid mtest_f77)
 #target_link_libraries(winscale2f 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}/winaccf.f
@@ -66,14 +54,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale1f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale2f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/addsize.h
-  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)