From c0710dae6908e7b671c32bc739fe2f4dbf2649aa Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 4 Mar 2016 11:07:43 +0100 Subject: [PATCH] extend the implementation note in comments --- tools/cmake/Java.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index d7202299db..05680ae4b8 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -134,8 +134,10 @@ if(enable_lib_in_jar) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} - # There is no way to disable the dependency of mingw-64 on that lib, unfortunately - # nor to script cmake -E properly, so let's be brutal + # There is no way to disable the dependency of mingw-64 on that lib, unfortunately nor to script cmake -E properly + # So let's be brutal and copy it in any case (even on non-windows builds). + # The copy is only expected to work on the appveyor builder, but that's all we need right now + # since our users are directed to download that file as nightly build. COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} ${JAVA_NATIVE_PATH} -- 2.20.1