Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / tools / cmake / UnitTesting.cmake

diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake
index 2435bf6..c7dc531 100644 (file)
--- a/tools/cmake/UnitTesting.cmake
+++ b/tools/cmake/UnitTesting.cmake
@@ -6,11 +6,9 @@ set(TEST_CFILES
   src/xbt/ex.c
   src/xbt/dynar.c
   src/xbt/dict.c
-  src/xbt/set.c
   src/xbt/swag.c
   src/xbt/xbt_str.c
   src/xbt/xbt_strbuff.c
-  src/xbt/xbt_sha.c
   src/xbt/config.c
   )
 set(TEST_UNITS
@@ -18,11 +16,9 @@ set(TEST_UNITS
   ${CMAKE_CURRENT_BINARY_DIR}/src/ex_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/dynar_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/dict_unit.c
-  ${CMAKE_CURRENT_BINARY_DIR}/src/set_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/swag_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_str_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_strbuff_unit.c
-  ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_sha_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/config_unit.c
 
   ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c
@@ -60,12 +56,6 @@ ADD_CUSTOM_COMMAND(
 
 set_source_files_properties(${TEST_UNITS} PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/")
-add_executable(testall ${TEST_UNITS})
+add_executable       (testall ${TEST_UNITS})
+target_link_libraries(testall simgrid)
 
-### Add definitions for compile
-if(NOT WIN32)
-  target_link_libraries(testall simgrid m)
-else()
-  target_link_libraries(testall simgrid)
-endif()