Windows compatibility.

[simgrid.git] / buildtools / Cmake / MakeExeLibWin.cmake

diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake
index 56e8e53..df0fc05 100644 (file)
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExeLibWin.cmake
@@ -1,28 +1,18 @@
 ### Make Libs\r
-       \r
-add_library(simgrid SHARED ${simgrid_sources})\r
-add_library(simgrid_static STATIC ${simgrid_sources})\r
-add_library(gras SHARED ${gras_sources})\r
-add_library(gras_static STATIC ${gras_sources})\r
-\r
-set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})\r
-set_target_properties(gras PROPERTIES VERSION ${libgras_version})\r
-\r
+#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32        \r
+add_library(simgrid STATIC ${simgrid_sources})\r
+add_library(gras STATIC ${gras_sources})\r
 \r
 if(MSVC)\r
-    set_target_properties(gras            PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_EXPORT")\r
-    set_target_properties(gras_static     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
+    set_target_properties(gras     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
                                                      OUTPUT_NAME   "gras")\r
-    set_target_properties(simgrid         PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_EXPORT")\r
-    set_target_properties(simgrid_static  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
+    set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"\r
                                                      OUTPUT_NAME   "simgrid")\r
 else(MSVC)\r
     if(CMAKE_COMPILER_IS_GNUCC)\r
-        set_target_properties(gras            PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_EXPORT")\r
-        set_target_properties(gras_static     PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
+        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
                                                          OUTPUT_NAME   "gras")\r
-        set_target_properties(simgrid         PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_EXPORT")\r
-        set_target_properties(simgrid_static  PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
+        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
                                                          OUTPUT_NAME   "simgrid")\r
     else(CMAKE_COMPILER_IS_GNUCC)\r
         message(FATAL_ERROR "Compilateur non connu!!!")\r
@@ -33,9 +23,7 @@ set(GRAS_DEP "wsock32")
 set(SIMGRID_DEP "wsock32")\r
 \r
 target_link_libraries(simgrid  ${SIMGRID_DEP})\r
-target_link_libraries(simgrid_static   ${SIMGRID_DEP})\r
 target_link_libraries(gras     ${GRAS_DEP})\r
-target_link_libraries(gras_static      ${GRAS_DEP})\r
 \r
 ### Make EXEs\r
 \r
@@ -48,8 +36,5 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/icomms)
 #testsuite/xbt\r
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)\r
 \r
-#testsuite/surf\r
-add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)\r
-\r
 #testsuite/simdag\r
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
\ No newline at end of file