-### Add definitions for compile
-if(NOT WIN32)
- target_link_libraries(storage_basic simgrid m pthread )
- target_link_libraries(concurrent_rw simgrid m pthread )
-else()
- target_link_libraries(storage_basic simgrid)
- target_link_libraries(concurrent_rw simgrid)
-endif()
+ ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/storage ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage/${x}.tesh)
+endforeach()
+
+set(tesh_files ${tesh_files} PARENT_SCOPE)
+set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)