Merge branch 'mc' into mc++

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

diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
index c19c489..b3f9899 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(enable_smpi AND SMPI_F2C)
+if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
   else()
@@ -9,50 +9,39 @@ if(enable_smpi AND SMPI_F2C)
   endif()
 
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1  -Wno-error=unused-variable -Wno-implicit -Wno-implicit-function-declaration")
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/")
 
-  add_executable(attrmpi1f attrmpi1f.f ../util/mtestf.f)
-  add_executable(baseattr2f baseattr2f.f ../util/mtestf.f)
-  add_executable(baseattrf baseattrf.f ../util/mtestf.f)
-  add_executable(commattr2f commattr2f.f ../util/mtestf.f)
-  add_executable(commattr3f commattr3f.f ../util/mtestf.f)
-  add_executable(commattrf commattrf.f  ../util/mtestf.f)
-  add_executable(typeattr2f typeattr2f.f  ../util/mtestf.f)
-  add_executable(typeattr3f typeattr3f.f  ../util/mtestf.f)
-  add_executable(typeattrf typeattrf.f  ../util/mtestf.f)
+  add_executable(attrmpi1f attrmpi1f.f)
+  add_executable(baseattr2f baseattr2f.f)
+  add_executable(baseattrf baseattrf.f)
+  add_executable(commattr2f commattr2f.f)
+  add_executable(commattr3f commattr3f.f)
+  add_executable(commattrf commattrf.f )
+  add_executable(typeattr2f typeattr2f.f )
+  add_executable(typeattr3f typeattr3f.f )
+  add_executable(typeattrf typeattrf.f )
 
-  target_link_libraries(attrmpi1f  simgrid)
-  target_link_libraries(baseattr2f  simgrid)
-  target_link_libraries(baseattrf  simgrid)
-  target_link_libraries(commattr2f  simgrid)
-  target_link_libraries(commattr3f  simgrid)
-  target_link_libraries(commattrf  simgrid)
-  target_link_libraries(typeattr2f  simgrid)
-  target_link_libraries(typeattr3f  simgrid)
-  target_link_libraries(typeattrf  simgrid)
-
-  set_target_properties(attrmpi1f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(baseattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(commattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattr2f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattr3f PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-  set_target_properties(typeattrf PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+  target_link_libraries(attrmpi1f simgrid mtest_f77)
+  target_link_libraries(baseattr2f simgrid mtest_f77)
+  target_link_libraries(baseattrf simgrid mtest_f77)
+  target_link_libraries(commattr2f simgrid mtest_f77)
+  target_link_libraries(commattr3f simgrid mtest_f77)
+  target_link_libraries(commattrf simgrid mtest_f77)
+  target_link_libraries(typeattr2f simgrid mtest_f77)
+  target_link_libraries(typeattr3f simgrid mtest_f77)
+  target_link_libraries(typeattrf 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}/attraints.h
@@ -66,13 +55,13 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattr3f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typeattrf.f
   PARENT_SCOPE
-  )
+)
 set(bin_files
   ${bin_files}
   PARENT_SCOPE
-  )
+)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   PARENT_SCOPE
-  )
+)