X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/110c3530580066908945ff61a7fcadbafa214cbe..cc3fbc08e8b448f5b820a2e5719f2029dcb23f89:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 49870b3e95..90351fca56 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -1,15 +1,15 @@
 ### Make Libs
 
-if(enable_supernovae)
+if(enable_supernovae AND NOT WIN32)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeSupernovae.txt)
-else(enable_supernovae)	
+else(enable_supernovae AND NOT WIN32)	
 	add_library(simgrid SHARED ${simgrid_sources})
 	add_library(simgrid_static STATIC ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
 	if(enable_smpi)
 		add_library(smpi SHARED ${SMPI_SRC})
 	endif(enable_smpi)
-endif(enable_supernovae)
+endif(enable_supernovae AND NOT WIN32)
 
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 set_target_properties(gras PROPERTIES VERSION ${libgras_version})
@@ -22,9 +22,13 @@ set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
+if(WIN32)
+	set(GRAS_DEP "-lm")
+endif(WIN32)
+
 if(HAVE_RUBY)
 	set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module")
-	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+	exec_program("${CMAKE_COMMAND} -E create_symlink ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -44,7 +48,7 @@ endif(pthread)
 
 if(HAVE_LUA)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
-	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+	exec_program("${CMAKE_COMMAND} -E create_symlink ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
@@ -64,10 +68,6 @@ if(enable_smpi)
 endif(enable_smpi)
 
 
-#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid")
-#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib")
-
-
 ### Make EXEs
 
 #src/testall
@@ -125,6 +125,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/tracing)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/mc)
 if(HAVE_GTNETS)
 	add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
@@ -139,53 +140,4 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 if(enable_smpi)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
-endif(enable_smpi)
-
-set(targets_depended_of_gras_stub_generator
-ping_client
-ping_server
-ping_simulator
-rpc_client
-rpc_forwarder
-rpc_server
-rpc_simulator
-spawn_child
-spawn_father
-spawn_simulator
-timer_client
-timer_simulator
-chrono_multiplier
-chrono_simulator
-simple_token_node
-simple_token_simulator
-mmrpc_client
-mmrpc_server
-mmrpc_simulator
-all2all_receiver
-all2all_sender
-all2all_simulator
-pmm_master
-pmm_simulator
-pmm_slave
-synchro_philosopher
-synchro_simulator
-properties_alice
-properties_bob
-properties_simulator
-msg_handle_client
-msg_handle_server
-msg_handle_simulator
-empty_main_function
-empty_main_simulator
-small_sleep_function
-small_sleep_simulator
-bandwidth_maestro
-bandwidth_sensor
-bandwidth_simulator
-saturate_maestro
-saturate_sensor
-saturate_simulator
-)
-foreach(file ${targets_depended_of_gras_stub_generator})
-	add_dependencies(${file} gras_stub_generator)
-endforeach(file ${targets_depended_of_gras_stub_generator})
+endif(enable_smpi)
\ No newline at end of file