From 4fc0e111d1f1a321148fbd950405c91dda6b4290 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 14 Mar 2016 17:09:51 +0100 Subject: [PATCH] cmake/java: On windows, take the dll from the chocolatey location --- tools/cmake/Java.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 45909384e4..e8fa5e22b6 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -134,11 +134,11 @@ 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 and copy it in any case (even on non-windows builds). + # So let's be brutal and copy it in any case (even on non-windows builds) from the location where chocolatey installs it. # 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 ${CMAKE_COMMAND} -E copy_if_different C:/tools/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true + COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}" -- 2.20.1