one CMakeLists per module: achieved!

diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt
index 2dc0eeb..0e95cdd 100644 (file)
--- a/teshsuite/surf/CMakeLists.txt
+++ b/teshsuite/surf/CMakeLists.txt
@@ -9,5 +9,14 @@ foreach(x lmm_usage surf_usage surf_usage2 trace_usage)
   ADD_TESH(tesh-surf-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/${x} ${x}.tesh)
 endforeach()
 
   ADD_TESH(tesh-surf-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/${x} ${x}.tesh)
 endforeach()
 

-set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
-set(tesh_files    ${tesh_files}     PARENT_SCOPE)
+add_executable       (maxmin_bench maxmin_bench/maxmin_bench.c)
+target_link_libraries(maxmin_bench simgrid)
+set_target_properties(maxmin_bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/maxmin_bench)
+
+foreach(x small medium large)
+  set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench_${x}.tesh)
+  ADD_TESH(tesh-surf-maxmin-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_${x}.tesh)
+endforeach()
+
+set(tesh_files     ${tesh_files}                                                               PARENT_SCOPE)
+set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench.c   PARENT_SCOPE)

diff --git a/teshsuite/surf/maxmin_bench/CMakeLists.txt b/teshsuite/surf/maxmin_bench/CMakeLists.txt
deleted file mode 100644 (file)
index 80e7cb5..0000000
--- a/teshsuite/surf/maxmin_bench/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_executable       (maxmin_bench maxmin_bench.c)
-target_link_libraries(maxmin_bench simgrid)
-
-foreach(x small medium large)
-  set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench_${x}.tesh)
-  ADD_TESH(tesh-surf-maxmin-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_${x}.tesh)
-endforeach()
-
-set(tesh_files     ${tesh_files}                                                  PARENT_SCOPE)
-set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c   PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 351226c..b91b37b 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -993,7 +993,6 @@ set(CMAKEFILES_TXT
   teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt

-    teshsuite/surf/maxmin_bench/CMakeLists.txt

   teshsuite/xbt/CMakeLists.txt
   
   teshsuite/smpi/isp/umpire/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
   
   teshsuite/smpi/isp/umpire/CMakeLists.txt