Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
New logo for installer.
[simgrid.git] / buildtools / Cmake / MakeLibWin.cmake
index fea8907..8e3f463 100644 (file)
@@ -3,28 +3,18 @@
 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_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_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_STATIC"\r
-                                                         OUTPUT_NAME   "gras")\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
-    endif(CMAKE_COMPILER_IS_GNUCC)\r
-endif(MSVC)\r
+set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"                                                  OUTPUT_NAME   "simgrid")\r
 \r
-set(GRAS_DEP "ws2_32")\r
-set(SIMGRID_DEP "ws2_32")\r
+set(GRAS_DEP "ws2_32 -lpthread")\r
+set(SIMGRID_DEP "ws2_32 -lpcre -lpthread")\r
 \r
-if(HAVE_PCRE_LIB)\r
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")\r
-endif(HAVE_PCRE_LIB)\r
+if(ARCH_32_BITS)\r
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")\r
+else(ARCH_32_BITS)\r
+        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")\r
+endif(ARCH_32_BITS)\r
 \r
 target_link_libraries(simgrid  ${SIMGRID_DEP})\r
-target_link_libraries(gras     ${GRAS_DEP})\r
+target_link_libraries(gras     ${GRAS_DEP})
\ No newline at end of file