X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..a0ddec9dc63d328e71dc4e46bd1341b779d88c72:/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
index bc07be4001..bda4c89ccc 100644
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/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,11 +6,10 @@ 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("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in typeaints.h @ONLY)
 
 #  add_executable(allctypesf allctypesf.f)
   add_executable(gaddressf gaddressf.f)
@@ -37,17 +34,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
 #  target_link_libraries(typenamef simgrid mtest_f77)
 #  target_link_libraries(typesnamef simgrid mtest_f77)
 #  target_link_libraries(typesubf 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}/allctypesf.f
@@ -62,14 +50,8 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typenamef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typesnamef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typesubf.f
-  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)