X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12846bb3ea797360d6a2a2d26c629dd194305c39..a73d9376e051e0019d2bf02c0d11e4ad340dcaf6:/tools/cmake/UnitTesting.cmake

diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake
index 1417fef18a..8586a3fc32 100644
--- a/tools/cmake/UnitTesting.cmake
+++ b/tools/cmake/UnitTesting.cmake
@@ -5,31 +5,22 @@
 # 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
+  src/xbt/dynar.cpp
+  src/xbt/dict.cpp
+  src/xbt/xbt_str.cpp
+  src/xbt/config.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
 ################################################################
 
 foreach(file ${FILES_CONTAINING_UNITTESTS})
   get_filename_component(basename ${file} NAME_WE)
-  set(EXTRACTED_TEST_SOURCE_FILES ${EXTRACTED_TEST_SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/src/${basename}_unit.c)
+  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)
@@ -47,4 +38,9 @@ ADD_CUSTOM_COMMAND(
 
 add_executable       (testall ${EXTRACTED_TEST_SOURCE_FILES})
 target_link_libraries(testall simgrid)
+set_property(
+    TARGET testall
+    APPEND PROPERTY
+           INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+	   )