Huge set of modifications to restore more uniform APIs when dealing with src and...

[simgrid.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89d9af4588e2020a3c4190851bfd49fb0823054b..9554134b2f18da381210fce5afdd62c2ddf803df 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
-#set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/")
+
 set(USE_TEST_UNITS
 ${TEST_UNITS}
 ${PROJECT_DIRECTORY}/src/simgrid_units_main.c
@@ -12,4 +13,10 @@ PROPERTIES GENERATED true)
 add_executable(testall ${USE_TEST_UNITS})
 
 ### Add definitions for compile
-target_link_libraries(testall gras m)
+if(NOT WIN32)
+    target_link_libraries(testall gras m)
+else(NOT WIN32)
+    target_link_libraries(testall gras)
+endif(NOT WIN32)
+
+add_dependencies(testall units_files)
\ No newline at end of file