Correctely search for pcre and pthread on windows.

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

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index 03db5e0..cd41fa9 100644 (file)
--- 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")\r
 set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
 \r
-set(GRAS_DEP "ws2_32 -lpthread")\r
-set(SIMGRID_DEP "ws2_32 -lpthread")\r
+# libpthreadGC2.dll\r
+if(ARCH_32_BITS)\r
+    find_library(PATH_PTHREAD_LIB \r
+       NAMES pthreadGC2.dll\r
+        HINTS\r
+        $ENV{PATH}\r
+        PATH_SUFFIXES bin/ c/bin\r
+        )\r
+else(ARCH_32_BITS)\r
+    find_library(PATH_PTHREAD_LIB \r
+       NAMES pthreadGC2-w64.dll\r
+        HINTS\r
+        $ENV{PATH}\r
+        PATH_SUFFIXES bin/ c/bin\r
+        )\r
+endif(ARCH_32_BITS)\r
+\r
+set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")\r
+set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")\r
 \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
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")\r
+#        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
 endif(ARCH_32_BITS)\r
 \r
 target_link_libraries(gras     ${GRAS_DEP})\r
-target_link_libraries(simgrid  ${SIMGRID_DEP} ${PATH_PCRE_LIB})\r
+target_link_libraries(simgrid  ${SIMGRID_DEP})\r
 \r
 find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)\r
 message(STATUS "pexports: ${PEXPORTS_PATH}")\r