fix make distcheck

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index b9953e7..d112293 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -20,7 +20,4 @@ set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/README
   PARENT_SCOPE
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/README
   PARENT_SCOPE

-  )
-
-add_subdirectory(basic)
-add_subdirectory(io)
\ No newline at end of file
+  )
\ No newline at end of file

diff --git a/examples/s4u/io/s4u_io_test.tesh b/examples/s4u/io/s4u_io.tesh
similarity index 100%
rename from examples/s4u/io/s4u_io_test.tesh
rename to examples/s4u/io/s4u_io.tesh

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e34d7e3..3c33fd9 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1074,7 +1074,8 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt

-  examples/s4u/dumb/CMakeLists.txt
+  examples/s4u/basic/CMakeLists.txt
+  examples/s4u/io/CMakeLists.txt

   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt
   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt

diff --git a/tools/cmake/MakeExe.cmake b/tools/cmake/MakeExe.cmake
index fd58228..5831e11 100644 (file)
--- a/tools/cmake/MakeExe.cmake
+++ b/tools/cmake/MakeExe.cmake
@@ -59,6 +59,8 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u)

+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u/basic)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u/io)

 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass)

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index fafa4fc..0328cb6 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -285,7 +285,7 @@ IF(NOT enable_memcheck)
 
   ### S4U ###
   ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh)
 
   ### S4U ###
   ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh)

-  ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io_test.tesh)
+  ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io.tesh)

 
 
   ### SIMDAG ###
 
 
   ### SIMDAG ###