X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c721629150c7b33384ad54368793a5372c7f831..c4de3b4124781ae066e774981efb0a6ef8c857ed:/tools/cmake/UnitTesting.cmake

diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake
index fe83e00055..93a7d777d8 100644
--- a/tools/cmake/UnitTesting.cmake
+++ b/tools/cmake/UnitTesting.cmake
@@ -5,23 +5,9 @@
 # FILES_CONTAINING_UNITTESTS and have a pleasant day.
 
 set(FILES_CONTAINING_UNITTESTS
-  src/xbt/cunit.c
-  src/xbt/ex.c
-  src/xbt/dynar.c
-  src/xbt/dict.c
-  src/xbt/swag.c
-  src/xbt/xbt_str.c
-  src/xbt/xbt_strbuff.c
-  src/xbt/config.c
+  src/xbt/cunit.cpp
 )
 
-if(HAVE_MC)
-  set(FILES_CONTAINING_UNITTESTS ${FILES_CONTAINING_UNITTESTS}
-      src/mc/PageStore.cpp
-      src/mc/mc_snapshot.cpp
-  )
-endif()
-
 ####  Nothing to change below this line to add a new tested file
 ################################################################
 
@@ -30,7 +16,7 @@ foreach(file ${FILES_CONTAINING_UNITTESTS})
   get_filename_component(ext ${file} EXT)
   set(EXTRACTED_TEST_SOURCE_FILES ${EXTRACTED_TEST_SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/src/${basename}_unit${ext})
 endforeach()
-  
+
 set(EXTRACTED_TEST_SOURCE_FILES ${EXTRACTED_TEST_SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c)
 
 set_source_files_properties(${EXTRACTED_TEST_SOURCE_FILES} PROPERTIES GENERATED true)
@@ -46,6 +32,12 @@ ADD_CUSTOM_COMMAND(
   COMMAND           ${CMAKE_HOME_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${FILES_CONTAINING_UNITTESTS}
 )
 
-add_executable       (testall ${EXTRACTED_TEST_SOURCE_FILES})
+add_executable       (testall EXCLUDE_FROM_ALL ${EXTRACTED_TEST_SOURCE_FILES})
+add_dependencies(tests testall)
 target_link_libraries(testall simgrid)
+set_property(
+    TARGET testall
+    APPEND PROPERTY
+           INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+	   )