From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 5 Oct 2015 23:48:24 +0000 (+0200)
Subject: [win] I fail to disable winpthread + I think it's harmless, so re-enable it
X-Git-Tag: v3_12~28
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2a193bac5da10ecc5d35b4763f5b5a247428b01b

[win] I fail to disable winpthread + I think it's harmless, so re-enable it
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 61b4606b53..cdb7710c5d 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -20,8 +20,8 @@ public final class NativeLib {
 		if (isNativeInited)
 			return;
 	        
-		//if (System.getProperty("os.name").toLowerCase().startsWith("win"))
-		//	NativeLib.nativeInit("winpthread-1");
+		if (System.getProperty("os.name").toLowerCase().startsWith("win"))
+			NativeLib.nativeInit("winpthread-1");
 
 		NativeLib.nativeInit("simgrid");
 		NativeLib.nativeInit("surf-java");
diff --git a/tools/cmake/CompleteInFiles.cmake b/tools/cmake/CompleteInFiles.cmake
index 0a5cc35656..e695dcf939 100644
--- a/tools/cmake/CompleteInFiles.cmake
+++ b/tools/cmake/CompleteInFiles.cmake
@@ -142,9 +142,7 @@ endif()
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(dl      dlopen                  "" HAVE_DLOPEN_IN_LIBDL)
 CHECK_LIBRARY_EXISTS(execinfo backtrace              "" HAVE_BACKTRACE_IN_LIBEXECINFO)
-if(NOT WIN32)
-  CHECK_LIBRARY_EXISTS(pthread pthread_create          "" HAVE_PTHREAD)
-endif()
+CHECK_LIBRARY_EXISTS(pthread pthread_create          "" HAVE_PTHREAD)
 CHECK_LIBRARY_EXISTS(pthread sem_init                "" HAVE_SEM_INIT_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_open                "" HAVE_SEM_OPEN_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_timedwait           "" HAVE_SEM_TIMEDWAIT_LIB)
diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 46a32270c0..ac327078ca 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -134,24 +134,24 @@ if(enable_lib_in_jar)
     COMMAND ${CMAKE_COMMAND} -E echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}"
     COMMAND "${Java_JAVA_EXECUTABLE}" -classpath "${SIMGRID_JAR}" org.simgrid.NativeLib
     )
-  #if(MINGW)
-  #  find_library(WINPTHREAD_DLL
-  #    NAME winpthread winpthread-1
-  #    PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
-  #  )
-  #  add_custom_command(
-  #    TARGET simgrid-java_jar POST_BUILD
-  #    COMMENT "Add the MinGW libs into simgrid.jar..."
-  #    DEPENDS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
-  #
-  #    COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
-  #    COMMAND ${CMAKE_COMMAND} -E make_directory          ${JAVA_NATIVE_PATH}
-  #    COMMAND ${CMAKE_COMMAND} -E copy ${WINPTHREAD_DLL}  ${JAVA_NATIVE_PATH}
-  #
-  #    COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
-  #    COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
-  #  )
-  #endif(MINGW)
+  if(MINGW)
+    find_library(WINPTHREAD_DLL
+      NAME winpthread winpthread-1
+      PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
+    )
+    add_custom_command(
+      TARGET simgrid-java_jar POST_BUILD
+      COMMENT "Add the MinGW libs into simgrid.jar..."
+      DEPENDS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
+
+      COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
+      COMMAND ${CMAKE_COMMAND} -E make_directory          ${JAVA_NATIVE_PATH}
+      COMMAND ${CMAKE_COMMAND} -E copy ${WINPTHREAD_DLL}  ${JAVA_NATIVE_PATH}
+
+      COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
+      COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
+    )
+  endif(MINGW)
 endif(enable_lib_in_jar)
 
 include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})