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

diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake
index 41ed4544ec..c1f0a6d82e 100644
--- a/tools/cmake/UnitTesting.cmake
+++ b/tools/cmake/UnitTesting.cmake
@@ -6,16 +6,13 @@
 
 set(FILES_CONTAINING_UNITTESTS
   src/xbt/cunit.cpp
-  src/xbt/ex.cpp
   src/xbt/dynar.cpp
   src/xbt/dict.cpp
-  src/xbt/swag.c
   src/xbt/xbt_str.cpp
-  src/xbt/xbt_strbuff.c
   src/xbt/config.cpp
 )
 
-if(HAVE_MC)
+if(SIMGRID_HAVE_MC)
   set(FILES_CONTAINING_UNITTESTS ${FILES_CONTAINING_UNITTESTS}
       src/mc/PageStore.cpp
       src/mc/mc_snapshot.cpp
@@ -30,7 +27,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)
@@ -48,4 +45,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}"
+	   )