X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28a9d92f4bcb1c84d5d055e86a68bdf302ffbd74..80d5ffa0b1d4c8c37ef5ed5dd8abc1920b3460a5:/buildtools/Cmake/MakeExeLibWin.cmake

diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake
index 04a74f820a..fb2193d570 100644
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExeLibWin.cmake
@@ -1,27 +1,29 @@
 ### Make Libs
-	
-add_library(simgrid SHARED ${simgrid_sources})
-add_library(simgrid_static STATIC ${simgrid_sources})
-add_library(gras SHARED ${gras_sources})
-add_library(gras_static STATIC ${gras_sources})
-
-set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
-set_target_properties(gras PROPERTIES VERSION ${libgras_version})
-
-set_target_properties(gras            PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_EXPORT")
-set_target_properties(gras_static     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
-                                                 OUTPUT_NAME   "gras")
-set_target_properties(simgrid         PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_EXPORT")
-set_target_properties(simgrid_static  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
-                                                 OUTPUT_NAME   "simgrid")
+#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32	
+add_library(simgrid STATIC ${simgrid_sources})
+add_library(gras STATIC ${gras_sources})
+
+if(MSVC)
+    set_target_properties(gras     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
+                                                     OUTPUT_NAME   "gras")
+    set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
+                                                     OUTPUT_NAME   "simgrid")
+else(MSVC)
+    if(CMAKE_COMPILER_IS_GNUCC)
+        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"
+                                                         OUTPUT_NAME   "gras")
+        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"
+                                                         OUTPUT_NAME   "simgrid")
+    else(CMAKE_COMPILER_IS_GNUCC)
+        message(FATAL_ERROR "Compilateur non connu!!!")
+    endif(CMAKE_COMPILER_IS_GNUCC)
+endif(MSVC)
 
 set(GRAS_DEP "wsock32")
 set(SIMGRID_DEP "wsock32")
 
 target_link_libraries(simgrid 	${SIMGRID_DEP})
-target_link_libraries(simgrid_static	${SIMGRID_DEP})
 target_link_libraries(gras 	${GRAS_DEP})
-target_link_libraries(gras_static 	${GRAS_DEP})
 
 ### Make EXEs
 
@@ -32,7 +34,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/src)
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
 #tools/tesh
-add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
+#add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
 
 #testsuite/xbt
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
@@ -45,7 +47,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
 
 #teshsuite
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
-add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
+#add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)
@@ -69,6 +71,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/all2all)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/pmm)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/synchro)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/properties)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/console)
 
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/actions)
@@ -80,16 +83,28 @@ 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/icomms)
 
 if(HAVE_MC)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/mc)
 endif(HAVE_MC)
 
+if(HAVE_GTNETS)
+	add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
+	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
+endif(HAVE_GTNETS)
+
 add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/bandwidth)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
 
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
+if(HAVE_GRAPHVIZ)
+  add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
+endif(HAVE_GRAPHVIZ)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)
+if(enable_smpi)
+	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+endif(enable_smpi)
\ No newline at end of file