X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/176b21d6ac0835d9bb1a22f93410df314ba8a057..d4b76dc130a44f100d1fb144ba99af1b4ee434d9:/buildtools/Cmake/MakeLibWin.cmake

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index 03db5e02de..cd41fa9e55 100644
--- a/buildtools/Cmake/MakeLibWin.cmake
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -6,17 +6,35 @@ add_library(gras SHARED ${gras_sources})
 set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version}    OUTPUT_NAME "gras")
 set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
 
-set(GRAS_DEP "ws2_32 -lpthread")
-set(SIMGRID_DEP "ws2_32 -lpthread")
+# libpthreadGC2.dll
+if(ARCH_32_BITS)
+    find_library(PATH_PTHREAD_LIB 
+    	NAMES pthreadGC2.dll
+        HINTS
+        $ENV{PATH}
+        PATH_SUFFIXES bin/ c/bin
+        )
+else(ARCH_32_BITS)
+    find_library(PATH_PTHREAD_LIB 
+    	NAMES pthreadGC2-w64.dll
+        HINTS
+        $ENV{PATH}
+        PATH_SUFFIXES bin/ c/bin
+        )
+endif(ARCH_32_BITS)
+
+set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")
+set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
 
 if(ARCH_32_BITS)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
 else(ARCH_32_BITS)
-        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+#        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
 endif(ARCH_32_BITS)
 
 target_link_libraries(gras 	${GRAS_DEP})
-target_link_libraries(simgrid 	${SIMGRID_DEP} ${PATH_PCRE_LIB})
+target_link_libraries(simgrid 	${SIMGRID_DEP})
 
 find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
 message(STATUS "pexports: ${PEXPORTS_PATH}")