X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..3eb8b6369503c39208fcf754830b6b26dc4186fc:/teshsuite/smpi/mpich3-test/CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt
index f8b8f8ecd6..4e912b95a4 100644
--- a/teshsuite/smpi/mpich3-test/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt
@@ -1,26 +1,7 @@
-set(tesh_files
-  ${tesh_files}
-  
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
-set(examples_src
-  ${examples_src}
-  PARENT_SCOPE
-  )
 set(bin_files
   ${bin_files}
-  PARENT_SCOPE
-  )
-  
-#set(stdo_std_smpi
-#  ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartmap.std
-#  ${CMAKE_CURRENT_SOURCE_DIR}/topol/graphtest.std
-#  ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartf.std
-#)
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
+  PARENT_SCOPE)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 else()
@@ -39,10 +20,14 @@ set(txt_files
   ${CMAKE_CURRENT_SOURCE_DIR}/testlist
   ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
   ${CMAKE_CURRENT_SOURCE_DIR}/checktests
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
   ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_manual.c
   ${CMAKE_CURRENT_SOURCE_DIR}/f77/testlist
   ${CMAKE_CURRENT_SOURCE_DIR}/f90/testlist
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/dtypes.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h
   PARENT_SCOPE)
 
@@ -55,12 +40,14 @@ else()
   set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
 endif()
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
 
-#C version
-add_library(mtest_c STATIC util/mtest.c)
-
-
-
+if(enable_smpi AND enable_smpi_MPICH3_testsuite)
+#C version - use automatic privatization if mmap is supported, manual through SMPI macros if not
+  if(HAVE_PRIVATIZATION)
+    add_library(mtest_c STATIC util/mtest.c)
+  else()
+    add_library(mtest_c STATIC util/mtest_manual.c)
+  endif()
+endif()