From 02ebea09722b5771615925a873eba3512ef11cf3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 5 Aug 2018 02:52:55 +0200 Subject: [PATCH] java: use the appveyor-provided libwinpthread-1.dll --- tools/cmake/Java.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 5419109684..4aaf5a322c 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -131,10 +131,10 @@ if(WIN32) DEPENDS simgrid simgrid-java ${JAVALIBS} # 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) from the location where chocolatey installs it. + # So let's be brutal and copy it in any case (even on non-windows builds) from the location where appveyor provides 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:/tools/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true + COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true ) endif() -- 2.20.1