Update CMakeLists for windows

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8177 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt
index d7eb8be..c9246cf 100644 (file)
--- a/examples/amok/bandwidth/CMakeLists.txt
+++ b/examples/amok/bandwidth/CMakeLists.txt
@@ -23,6 +23,12 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(bandwidth_simulator simgrid pthread m )
 target_link_libraries(bandwidth_maestro gras pthread m )
 target_link_libraries(bandwidth_sensor gras pthread m )
+else(NOT WIN32)
+target_link_libraries(bandwidth_simulator simgrid)
+target_link_libraries(bandwidth_maestro gras)
+target_link_libraries(bandwidth_sensor gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt
index 920a64d..910c328 100644 (file)
--- a/examples/amok/saturate/CMakeLists.txt
+++ b/examples/amok/saturate/CMakeLists.txt
@@ -23,6 +23,12 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(saturate_simulator simgrid pthread m )
 target_link_libraries(saturate_maestro gras pthread m )
-target_link_libraries(saturate_sensor gras pthread m )
\ No newline at end of file
+target_link_libraries(saturate_sensor gras pthread m )
+else(NOT WIN32)
+target_link_libraries(saturate_simulator simgrid)
+target_link_libraries(saturate_maestro gras)
+target_link_libraries(saturate_sensor gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt
index 6a727e8..06ea845 100644 (file)
--- a/examples/gras/all2all/CMakeLists.txt
+++ b/examples/gras/all2all/CMakeLists.txt
@@ -23,6 +23,13 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(all2all_simulator simgrid pthread m )
 target_link_libraries(all2all_sender gras pthread m )
 target_link_libraries(all2all_receiver gras pthread m )
+else(NOT WIN32)
+target_link_libraries(all2all_simulator simgrid)
+target_link_libraries(all2all_sender gras)
+target_link_libraries(all2all_receiver gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt
index 14d0b39..1971a7c 100644 (file)
--- a/examples/gras/chrono/CMakeLists.txt
+++ b/examples/gras/chrono/CMakeLists.txt
@@ -19,5 +19,10 @@ add_custom_command(
 )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(chrono_simulator simgrid pthread m )
-target_link_libraries(chrono_multiplier gras pthread m )
\ No newline at end of file
+target_link_libraries(chrono_multiplier gras pthread m )
+else(NOT WIN32)
+target_link_libraries(chrono_simulator simgrid)
+target_link_libraries(chrono_multiplier gras)
+endif(NOT WIN32)

diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt
index 3abe43f..56119ab 100644 (file)
--- a/examples/gras/mmrpc/CMakeLists.txt
+++ b/examples/gras/mmrpc/CMakeLists.txt
@@ -27,6 +27,13 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(mmrpc_simulator simgrid pthread m )
 target_link_libraries(mmrpc_client gras pthread m )
 target_link_libraries(mmrpc_server gras pthread m )
+else(NOT WIN32)
+target_link_libraries(mmrpc_simulator simgrid)
+target_link_libraries(mmrpc_client gras)
+target_link_libraries(mmrpc_server gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
index d668d58..71985fe 100644 (file)
--- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
+++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
@@ -19,6 +19,12 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(simple_token_simulator simgrid pthread m )
 target_link_libraries(simple_token_node gras pthread m )
+else(NOT WIN32)
+target_link_libraries(simple_token_simulator simgrid)
+target_link_libraries(simple_token_node gras)
+endif(NOT WIN32)
+
 

diff --git a/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt
index 4ea6838..7557a31 100644 (file)
--- a/examples/gras/ping/CMakeLists.txt
+++ b/examples/gras/ping/CMakeLists.txt
@@ -26,6 +26,12 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(ping_simulator simgrid pthread m )
 target_link_libraries(ping_client gras pthread m )
 target_link_libraries(ping_server gras pthread m )
+else(NOT WIN32)
+target_link_libraries(ping_simulator simgrid)
+target_link_libraries(ping_client gras)
+target_link_libraries(ping_server gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt
index 9f7e3d1..9048fd2 100644 (file)
--- a/examples/gras/pmm/CMakeLists.txt
+++ b/examples/gras/pmm/CMakeLists.txt
@@ -23,6 +23,13 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(pmm_simulator simgrid pthread m )
 target_link_libraries(pmm_slave gras pthread m )
 target_link_libraries(pmm_master gras pthread m )
+else(NOT WIN32)
+target_link_libraries(pmm_simulator simgrid)
+target_link_libraries(pmm_slave gras)
+target_link_libraries(pmm_master gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt
index 3ec065e..8435d42 100644 (file)
--- a/examples/gras/properties/CMakeLists.txt
+++ b/examples/gras/properties/CMakeLists.txt
@@ -22,6 +22,13 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(properties_simulator simgrid pthread m )
 target_link_libraries(properties_alice gras pthread m )
 target_link_libraries(properties_bob gras pthread m )
+else(NOT WIN32)
+target_link_libraries(properties_simulator simgrid)
+target_link_libraries(properties_alice gras)
+target_link_libraries(properties_bob gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt
index ddb6fc1..0a89137 100644 (file)
--- a/examples/gras/rpc/CMakeLists.txt
+++ b/examples/gras/rpc/CMakeLists.txt
@@ -23,7 +23,15 @@ add_custom_command(
 )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(rpc_simulator simgrid pthread m )
 target_link_libraries(rpc_client gras pthread m )
 target_link_libraries(rpc_forwarder gras pthread m )
 target_link_libraries(rpc_server gras pthread m )
+else(NOT WIN32)
+target_link_libraries(rpc_simulator simgrid)
+target_link_libraries(rpc_client gras)
+target_link_libraries(rpc_forwarder gras)
+target_link_libraries(rpc_server gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt
index af74bf3..de6047e 100644 (file)
--- a/examples/gras/spawn/CMakeLists.txt
+++ b/examples/gras/spawn/CMakeLists.txt
@@ -28,9 +28,16 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(spawn_simulator simgrid pthread m )
 target_link_libraries(spawn_child gras pthread m )
 target_link_libraries(spawn_father gras pthread m )
+else(NOT WIN32)
+target_link_libraries(spawn_simulator simgrid)
+target_link_libraries(spawn_child gras)
+target_link_libraries(spawn_father gras)
+endif(NOT WIN32)
+
 
 
 

diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt
index ffc032c..55f848a 100644 (file)
--- a/examples/gras/synchro/CMakeLists.txt
+++ b/examples/gras/synchro/CMakeLists.txt
@@ -19,5 +19,11 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(synchro_simulator simgrid pthread m )
 target_link_libraries(synchro_philosopher gras pthread m )
+else(NOT WIN32)
+target_link_libraries(synchro_simulator simgrid)
+target_link_libraries(synchro_philosopher gras)
+endif(NOT WIN32)
+

diff --git a/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt
index ad883e9..2635844 100644 (file)
--- a/examples/gras/timer/CMakeLists.txt
+++ b/examples/gras/timer/CMakeLists.txt
@@ -19,5 +19,11 @@ add_custom_command(
 )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(timer_simulator simgrid pthread m )
 target_link_libraries(timer_client gras pthread m )
+else(NOT WIN32)
+target_link_libraries(timer_simulator simgrid)
+target_link_libraries(timer_client gras)
+endif(NOT WIN32)
+

diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt
index 0f59cf0..216b616 100644 (file)
--- a/examples/msg/masterslave/CMakeLists.txt
+++ b/examples/msg/masterslave/CMakeLists.txt
@@ -9,8 +9,16 @@ add_executable(masterslave_bypass "masterslave_bypass.c")
 add_executable(masterslave_console "masterslave_console.c")
 
 ### Add definitions for compile
+if(WIN32)
+target_link_libraries(masterslave_forwarder simgrid )
+target_link_libraries(masterslave_failure simgrid )
+target_link_libraries(masterslave_mailbox simgrid )
+target_link_libraries(masterslave_bypass simgrid )
+target_link_libraries(masterslave_console simgrid )
+else(WIN32)
 target_link_libraries(masterslave_forwarder simgrid m )
 target_link_libraries(masterslave_failure simgrid m )
 target_link_libraries(masterslave_mailbox simgrid m )
 target_link_libraries(masterslave_bypass simgrid m )
 target_link_libraries(masterslave_console simgrid m )
+endif(WIN32)
\ No newline at end of file

diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt
index 44f30e6..6529197 100644 (file)
--- a/examples/simdag/CMakeLists.txt
+++ b/examples/simdag/CMakeLists.txt
@@ -8,6 +8,7 @@ add_executable(ex_sd_seq_access sd_seq_access.c)
 add_executable(ex_sd_test_console sd_test_console.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(ex_sd_test simgrid pthread m )
 target_link_libraries(ex_sd_test2 simgrid pthread m )
 target_link_libraries(ex_sd_seq_access simgrid pthread m )
@@ -32,3 +33,30 @@ get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
 set_directory_properties(
  PROPERTIES
  ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/simdag/sd_test;${PROJECT_DIRECTORY}/examples/simdag/sd_test2;${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access")
+else(NOT WIN32)
+target_link_libraries(ex_sd_test simgrid)
+target_link_libraries(ex_sd_test2 simgrid)
+target_link_libraries(ex_sd_seq_access simgrid)
+
+add_custom_command(TARGET ex_sd_test
+       POST_BUILD
+       COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test.exe ${PROJECT_DIRECTORY}/examples/simdag/sd_test.exe
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/"
+)
+add_custom_command(TARGET ex_sd_test2
+       POST_BUILD
+       COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test2.exe ${PROJECT_DIRECTORY}/examples/simdag/sd_test2.exe
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/")
+
+add_custom_command(TARGET ex_sd_seq_access
+       POST_BUILD
+       COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_seq_access.exe ${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access.exe
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/")
+
+get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+set_directory_properties(
+ PROPERTIES
+ ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/simdag/sd_test.exe;${PROJECT_DIRECTORY}/examples/simdag/sd_test2.exe;${PROJECT_DIRECTORY}/examples/simdag/sd_seq_access.exe")
+
+endif(NOT WIN32)
+

diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt
index 6ddd602..a0880c3 100644 (file)
--- a/examples/simdag/dax/CMakeLists.txt
+++ b/examples/simdag/dax/CMakeLists.txt
@@ -5,4 +5,8 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/dax/")
 add_executable(dax_test dax_test.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(dax_test simgrid pthread m )
+else(NOT WIN32)
+target_link_libraries(dax_test simgrid)
+endif(NOT WIN32)

diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt
index 7e53381..a59619d 100644 (file)
--- a/examples/simdag/metaxml/CMakeLists.txt
+++ b/examples/simdag/metaxml/CMakeLists.txt
@@ -5,4 +5,8 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/metaxml/")
 add_executable(sd_meta sd_meta.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(sd_meta simgrid pthread m )
+else(NOT WIN32)
+target_link_libraries(sd_meta simgrid)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt
index 64c92c6..4039619 100644 (file)
--- a/examples/simdag/properties/CMakeLists.txt
+++ b/examples/simdag/properties/CMakeLists.txt
@@ -5,4 +5,8 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/properties/")
 add_executable(sd_prop sd_prop.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(sd_prop simgrid pthread m )
+else(NOT WIN32)
+target_link_libraries(sd_prop simgrid)
+endif(NOT WIN32)

diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt
index e95afa6..62b2018 100644 (file)
--- a/examples/simdag/scheduling/CMakeLists.txt
+++ b/examples/simdag/scheduling/CMakeLists.txt
@@ -5,4 +5,8 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/scheduling/")
 add_executable(minmin_test minmin_test.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(minmin_test simgrid pthread m)
+else(NOT WIN32)
+target_link_libraries(minmin_test simgrid)
+endif(NOT WIN32)

diff --git a/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt
index e9e0aef..1cbd2f7 100644 (file)
--- a/teshsuite/gras/datadesc/CMakeLists.txt
+++ b/teshsuite/gras/datadesc/CMakeLists.txt
@@ -5,4 +5,9 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/")
 add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(datadesc_usage gras m pthread)
+elseif(NOT WIN32)
+target_link_libraries(datadesc_usage gras)
+endif(NOT WIN32)
+

diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt
index aff518c..088eaad 100644 (file)
--- a/teshsuite/gras/empty_main/CMakeLists.txt
+++ b/teshsuite/gras/empty_main/CMakeLists.txt
@@ -19,5 +19,10 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(empty_main_simulator simgrid m pthread)
 target_link_libraries(empty_main_function gras m pthread)
+else(NOT WIN32)
+target_link_libraries(empty_main_simulator simgrid)
+target_link_libraries(empty_main_function gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt
index 6e0aeca..ae70634 100644 (file)
--- a/teshsuite/gras/msg_handle/CMakeLists.txt
+++ b/teshsuite/gras/msg_handle/CMakeLists.txt
@@ -23,6 +23,12 @@ add_custom_command(
                                        )
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(msg_handle_simulator simgrid m pthread )
 target_link_libraries(msg_handle_client gras m pthread )
 target_link_libraries(msg_handle_server gras m pthread )
+else(NOT WIN32)
+target_link_libraries(msg_handle_simulator simgrid)
+target_link_libraries(msg_handle_client gras)
+target_link_libraries(msg_handle_server gras)
+endif(NOT WIN32)

diff --git a/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt
index d5d3e1d..e52ad6d 100644 (file)
--- a/teshsuite/gras/small_sleep/CMakeLists.txt
+++ b/teshsuite/gras/small_sleep/CMakeLists.txt
@@ -19,5 +19,10 @@ add_custom_command(
                                        )
                                        
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(small_sleep_simulator simgrid m pthread)
 target_link_libraries(small_sleep_function gras m pthread)
+else(NOT WIN32)
+target_link_libraries(small_sleep_simulator simgrid)
+target_link_libraries(small_sleep_function gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
index 441cff8..2dc27bb 100644 (file)
--- a/teshsuite/msg/CMakeLists.txt
+++ b/teshsuite/msg/CMakeLists.txt
@@ -5,4 +5,8 @@ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/msg/")
 add_executable(get_sender ${PROJECT_DIRECTORY}/teshsuite/msg/get_sender.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(get_sender simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(get_sender simgrid)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index 5563242..98bcd14 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -11,6 +11,7 @@ add_executable(basic5 basic5.c)
 add_executable(basic6 basic6.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(basic0 simgrid m pthread )
 target_link_libraries(basic1 simgrid m pthread )
 target_link_libraries(basic2 simgrid m pthread )
@@ -18,3 +19,12 @@ target_link_libraries(basic3 simgrid m pthread )
 target_link_libraries(basic4 simgrid m pthread )
 target_link_libraries(basic5 simgrid m pthread )
 target_link_libraries(basic6 simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(basic0 simgrid)
+target_link_libraries(basic1 simgrid)
+target_link_libraries(basic2 simgrid)
+target_link_libraries(basic3 simgrid)
+target_link_libraries(basic4 simgrid)
+target_link_libraries(basic5 simgrid)
+target_link_libraries(basic6 simgrid)
+endif(NOT WIN32)

diff --git a/teshsuite/simdag/network/CMakeLists.txt b/teshsuite/simdag/network/CMakeLists.txt
index b19d29e..9386944 100644 (file)
--- a/teshsuite/simdag/network/CMakeLists.txt
+++ b/teshsuite/simdag/network/CMakeLists.txt
@@ -6,5 +6,9 @@ add_executable(test_reinit_costs test_reinit_costs.c)
 
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(test_reinit_costs simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(test_reinit_costs simgrid)
+endif(NOT WIN32)
 

diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt
index f19d099..97eb5db 100644 (file)
--- a/teshsuite/simdag/network/mxn/CMakeLists.txt
+++ b/teshsuite/simdag/network/mxn/CMakeLists.txt
@@ -7,6 +7,12 @@ add_executable(test_intra_independent_comm test_intra_independent_comm.c)
 add_executable(test_intra_scatter test_intra_scatter.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(test_intra_all2all simgrid m pthread )
 target_link_libraries(test_intra_independent_comm simgrid m pthread )
 target_link_libraries(test_intra_scatter simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(test_intra_all2all simgrid)
+target_link_libraries(test_intra_independent_comm simgrid)
+target_link_libraries(test_intra_scatter simgrid)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt
index ccf95c9..652c48b 100644 (file)
--- a/teshsuite/simdag/network/p2p/CMakeLists.txt
+++ b/teshsuite/simdag/network/p2p/CMakeLists.txt
@@ -8,7 +8,14 @@ add_executable(test_latency3 test_latency3.c)
 add_executable(test_latency_bound test_latency_bound.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(test_latency1 simgrid m pthread )
 target_link_libraries(test_latency2 simgrid m pthread )
 target_link_libraries(test_latency3 simgrid m pthread )
 target_link_libraries(test_latency_bound simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(test_latency1 simgrid)
+target_link_libraries(test_latency2 simgrid)
+target_link_libraries(test_latency3 simgrid)
+target_link_libraries(test_latency_bound simgrid)
+endif(NOT WIN32)

diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt
index e912349..86de84b 100644 (file)
--- a/teshsuite/simdag/partask/CMakeLists.txt
+++ b/teshsuite/simdag/partask/CMakeLists.txt
@@ -6,5 +6,10 @@ add_executable(test_comp_only_seq test_comp_only_seq.c)
 add_executable(test_comp_only_par test_comp_only_par.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(test_comp_only_seq simgrid m pthread )
 target_link_libraries(test_comp_only_par simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(test_comp_only_seq simgrid)
+target_link_libraries(test_comp_only_par simgrid)
+endif(NOT WIN32)

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index e3098ed..d8e8314 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -6,5 +6,10 @@ add_executable(basic_parsing_test basic_parsing_test.c)
 add_executable(flatifier flatifier.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(basic_parsing_test simgrid m pthread )
 target_link_libraries(flatifier simgrid m pthread )
+else(NOT WIN32)
+target_link_libraries(basic_parsing_test simgrid)
+target_link_libraries(flatifier simgrid)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index cb2c98b..5538eef 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -6,5 +6,10 @@ add_executable(log_large_test log_large_test.c)
 add_executable(parallel_log_crashtest parallel_log_crashtest.c)
 
 ### Add definitions for compile
+if(NOT WIN32)
 target_link_libraries(log_large_test gras m pthread )
 target_link_libraries(parallel_log_crashtest gras m pthread )
+else(NOT WIN32)
+target_link_libraries(log_large_test gras)
+target_link_libraries(parallel_log_crashtest gras)
+endif(NOT WIN32)
\ No newline at end of file

diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt
index 7897ee2..b1bc475 100644 (file)
--- a/tools/gras/CMakeLists.txt
+++ b/tools/gras/CMakeLists.txt
@@ -8,5 +8,5 @@ add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c window
 if(NOT WIN32)
     target_link_libraries(gras_stub_generator gras simgrid pthread m)
 else(NOT WIN32)
-    target_link_libraries(gras_stub_generator gras simgrid)
+    target_link_libraries(gras_stub_generator simgrid gras)
 endif(NOT WIN32)
\ No newline at end of file