X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b7b5860abcf6a2e17236f46fdcc27575df7a0bd..69b1e6446eec03ade6ed79ce6fc4de195b018cf7:/tools/cmake/Java.cmake?ds=sidebyside

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 405968e694..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
+      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(
@@ -167,7 +169,7 @@ include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH
 
 set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
 
-add_dependencies(simgrid-java simgrid)
+add_dependencies(simgrid-java_jar simgrid-java)
 add_dependencies(simgrid-java_jar simgrid)