Merge pull request #17 from mpoquet/master

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

diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt
index f8b8f8e..83a27b0 100644 (file)
--- a/teshsuite/smpi/mpich3-test/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(tesh_files
   ${tesh_files}
-  
+
   PARENT_SCOPE
   )
 set(xml_files
@@ -13,9 +13,10 @@ set(examples_src
   )
 set(bin_files
   ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
   PARENT_SCOPE
   )
-  
+
 #set(stdo_std_smpi
 #  ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartmap.std
 #  ${CMAKE_CURRENT_SOURCE_DIR}/topol/graphtest.std
@@ -39,10 +40,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)
 
@@ -59,8 +64,11 @@ 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()