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

[simgrid.git] / teshsuite / smpi / mpich3-test / f90 / datatype / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
index a400a1c..652b019 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/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")
@@ -8,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
   endif()
 
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
 #  add_executable(allctypesf90 allctypesf90.f90)
@@ -29,7 +26,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  add_executable(typename3f90 typename3f90.f90)
 #  add_executable(typenamef90 typenamef90.f90)
 #  add_executable(typesnamef90 typesnamef90.f90)
-#  add_executable(typesubf90 typesubf90.f90)
+  add_executable(typesubf90 typesubf90.f90)
 #  target_link_libraries(allctypesf90 simgrid mtest_f90)
  # target_link_libraries(createf90 simgrid mtest_f90)
   target_link_libraries(gaddressf90 simgrid mtest_f90)
@@ -48,18 +45,9 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  target_link_libraries(typename3f90 simgrid mtest_f90)
 #  target_link_libraries(typenamef90 simgrid mtest_f90)
 #  target_link_libraries(typesnamef90 simgrid mtest_f90)
-#  target_link_libraries(typesubf90 simgrid mtest_f90)
-
+  target_link_libraries(typesubf90 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}/allctypesf90.f90
@@ -81,14 +69,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typenamef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/typesnamef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/typesubf90.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)