extra cleanups in Storage

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

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
index 1f8e36b..247b492 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
+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,8 +6,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
     set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
   endif()
 
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
 #  add_executable(allredint8f90 allredint8f90.f90)
 #  add_executable(allredopttf90 allredopttf90.f90)
@@ -39,17 +36,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F90)
   target_link_libraries(split_typef90  simgrid mtest_f90)
   target_link_libraries(uallreducef90  simgrid mtest_f90)
   target_link_libraries(vw_inplacef90  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}/allredint8f90.f90
@@ -66,14 +54,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/split_typef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/uallreducef90.f90
   ${CMAKE_CURRENT_SOURCE_DIR}/vw_inplacef90.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)