Merge pull request #2 from mquinson/master

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

diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
index bde731c..ec4fdaa 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
@@ -10,14 +8,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 
   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")
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
-
   add_executable(accfence1 accfence1.c)
   add_executable(accfence2_am accfence2_am.c)
   add_executable(accfence2 accfence2.c)
-#  add_executable(accpscw1 accpscw1.c)
+  add_executable(accpscw1 accpscw1.c)
 #  add_executable(acc-loc acc-loc.c)
 #  add_executable(adlb_mimic1 adlb_mimic1.c)
   add_executable(allocmem allocmem.c)
@@ -58,13 +55,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(mcs-mutex mcs-mutex.c)
 #  add_executable(mixedsync mixedsync.c)
 #  add_executable(mutex_bench mutex_bench.c)
-#  add_executable(nullpscw nullpscw.c)
+  add_executable(nullpscw nullpscw.c)
 #  add_executable(pscw_ordering pscw_ordering.c)
 #  add_executable(put_base put_base.c)
 #  add_executable(put_bottom put_bottom.c)
   add_executable(putfence1 putfence1.c)
   add_executable(putfidx putfidx.c)
-#  add_executable(putpscw1 putpscw1.c)
+  add_executable(putpscw1 putpscw1.c)
 #  add_executable(req_example req_example.c)
 #  add_executable(reqops reqops.c)
 #  add_executable(rmanull rmanull.c)
@@ -82,17 +79,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(test1_am test1_am.c)
   add_executable(test1 test1.c)
   add_executable(test1_dt test1_dt.c)
-#  add_executable(test2_am test2_am.c)
-#  add_executable(test2 test2.c)
+  add_executable(test2_am test2_am.c)
+  add_executable(test2 test2.c)
 #  add_executable(test3_am test3_am.c)
-#  add_executable(test3 test3.c)
+  add_executable(test3 test3.c)
 #  add_executable(test4_am test4_am.c)
 #  add_executable(test4 test4.c)
   add_executable(test5_am test5_am.c)
   add_executable(test5 test5.c)
   add_executable(transpose1 transpose1.c)
   add_executable(transpose2 transpose2.c)
-#  add_executable(transpose3 transpose3.c)
+  add_executable(transpose3 transpose3.c)
 #  add_executable(transpose4 transpose4.c)
 #  add_executable(transpose5 transpose5.c)
   add_executable(transpose6 transpose6.c)
@@ -110,12 +107,10 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(win_zero win_zero.c)
 #  add_executable(wintest wintest.c)
 
-
-
   target_link_libraries(accfence1 simgrid mtest_c)
   target_link_libraries(accfence2_am simgrid mtest_c)
   target_link_libraries(accfence2 simgrid mtest_c)
-#  target_link_libraries(accpscw1 simgrid mtest_c)
+  target_link_libraries(accpscw1 simgrid mtest_c)
 #  target_link_libraries(acc-loc simgrid mtest_c)
 #  target_link_libraries(adlb_mimic1 simgrid mtest_c)
   target_link_libraries(allocmem simgrid mtest_c)
@@ -156,13 +151,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(mcs-mutex simgrid mtest_c)
 #  target_link_libraries(mixedsync simgrid mtest_c)
 #  target_link_libraries(mutex_bench simgrid mtest_c)
-#  target_link_libraries(nullpscw simgrid mtest_c)
+  target_link_libraries(nullpscw simgrid mtest_c)
 #  target_link_libraries(pscw_ordering simgrid mtest_c)
 #  target_link_libraries(put_base simgrid mtest_c)
 #  target_link_libraries(put_bottom simgrid mtest_c)
   target_link_libraries(putfence1 simgrid mtest_c)
   target_link_libraries(putfidx simgrid mtest_c)
-#  target_link_libraries(putpscw1 simgrid mtest_c)
+  target_link_libraries(putpscw1 simgrid mtest_c)
 #  target_link_libraries(req_example simgrid mtest_c)
 #  target_link_libraries(reqops simgrid mtest_c)
 #  target_link_libraries(rma-contig simgrid mtest_c)
@@ -180,17 +175,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(test1_am simgrid mtest_c)
   target_link_libraries(test1 simgrid mtest_c)
   target_link_libraries(test1_dt simgrid mtest_c)
-#  target_link_libraries(test2_am simgrid mtest_c)
-#  target_link_libraries(test2 simgrid mtest_c)
+  target_link_libraries(test2_am simgrid mtest_c)
+  target_link_libraries(test2 simgrid mtest_c)
 #  target_link_libraries(test3_am simgrid mtest_c)
-#  target_link_libraries(test3 simgrid mtest_c)
+  target_link_libraries(test3 simgrid mtest_c)
 #  target_link_libraries(test4_am simgrid mtest_c)
 #  target_link_libraries(test4 simgrid mtest_c)
   target_link_libraries(test5_am simgrid mtest_c)
   target_link_libraries(test5 simgrid mtest_c)
   target_link_libraries(transpose1 simgrid mtest_c)
   target_link_libraries(transpose2 simgrid mtest_c)
-#  target_link_libraries(transpose3 simgrid mtest_c)
+  target_link_libraries(transpose3 simgrid mtest_c)
 #  target_link_libraries(transpose4 simgrid mtest_c)
 #  target_link_libraries(transpose5 simgrid mtest_c)
   target_link_libraries(transpose6 simgrid mtest_c)
@@ -208,13 +203,11 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(win_zero simgrid mtest_c)
 #  target_link_libraries(wintest simgrid mtest_c)
 
-
-
  set_target_properties(accfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(accfence2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(accfence2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(acc-loc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(accpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(accpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(adlb_mimic1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(allocmem PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(attrorderwin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -254,13 +247,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 # set_target_properties(mcs-mutex PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(mixedsync PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(mutex_bench PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(nullpscw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(nullpscw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(pscw_ordering PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(put_base PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(put_bottom PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(putfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(putfidx PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(putpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(putpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(req_example PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(reqops PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(rmanull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -278,17 +271,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
  set_target_properties(test1_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test1_dt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test3_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test4_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test5_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(transpose3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(transpose3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(transpose4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(transpose5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose6 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -305,17 +298,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 # set_target_properties(win_large_shm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(win_zero PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(wintest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
 set(examples_src
   ${examples_src}
  ${CMAKE_CURRENT_SOURCE_DIR}/accfence1.c 
@@ -413,16 +397,10 @@ set(examples_src
  ${CMAKE_CURRENT_SOURCE_DIR}/win_shared_noncontig.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/win_shared_noncontig_put.c 
  ${CMAKE_CURRENT_SOURCE_DIR}/wintest.c 
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   ${CMAKE_CURRENT_SOURCE_DIR}/mcs-mutex.h
   ${CMAKE_CURRENT_SOURCE_DIR}/squelch.h
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)