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");
# 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)
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})