From: degomme <augustin.degomme@unibas.ch>
Date: Fri, 15 Jan 2016 15:46:32 +0000 (+0100)
Subject: try again to find this lib.. and don't crash if not found
X-Git-Tag: v3_13~1226
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/69b1e6446eec03ade6ed79ce6fc4de195b018cf7

try again to find this lib.. and don't crash if not found
---

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 2cb9ce377d..6e8e951d09 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -135,9 +135,11 @@ if(enable_lib_in_jar)
   if(MINGW)
     find_library(WINPTHREAD_DLL
       NAME winpthread winpthread-1
-      PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin C:\\msys64\\mingw64\\bin C:\\msys64\\mingw64 C:\\msys\\mingw64\\bin C:\\msys\\mingw64
+      PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin C:\\msys64\\mingw32\\bin C:\\msys64\\mingw32 C:\\msys\\mingw32\\bin C:\\msys\\mingw32 C:\\msys64\\mingw64\\bin C:\\msys64\\mingw64 C:\\msys\\mingw64\\bin C:\\msys\\mingw64
     )
-    set(JAVALIBS ${JAVALIBS} ${WINPTHREAD_DLL})
+    if(${WINPTHREAD_DLL})
+      set(JAVALIBS ${JAVALIBS} ${WINPTHREAD_DLL})
+    endif()
   endif(MINGW)
 
   add_custom_command(