diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt index fe0655675f91b6948921ffcf5e23375d1d1e97a0..5a6bcd5defe7a0d504161a5a7eb98b32dfb16b07 100644 --- a/Framework/CMakeLists.txt +++ b/Framework/CMakeLists.txt @@ -212,12 +212,11 @@ foreach(_bundle ${BUNDLES}) # Also ship mingw libraries for Inelastic fortran code. We need to do a # better job here and build things + file(GLOB MINGW_DLLS "${THIRD_PARTY_DIR}/bin/mingw/*.dll") if(WITH_PYTHON3) - install(FILES "${THIRD_PARTY_DIR}/bin/libquadmath-0.dll" "${THIRD_PARTY_DIR}/bin/libgcc_s_seh-1.dll" - DESTINATION ${_bundle}scripts/Inelastic) - else() - file(GLOB MINGW_DLLS "${THIRD_PARTY_DIR}/bin/mingw/*.dll") install(FILES ${MINGW_DLLS} DESTINATION ${_bundle}scripts/Inelastic) + else() + install(FILES ${MINGW_DLLS} DESTINATION ${_bundle}scripts/Inelastic/cp27) endif() else() install(DIRECTORY ../scripts/ diff --git a/buildconfig/CMake/Bootstrap.cmake b/buildconfig/CMake/Bootstrap.cmake index 31b6828cd6879556c983b3025ed6dc02c36fd7ef..d3c010845623cf793daa8d4b5c21500896782100 100644 --- a/buildconfig/CMake/Bootstrap.cmake +++ b/buildconfig/CMake/Bootstrap.cmake @@ -17,7 +17,7 @@ if(MSVC) set(THIRD_PARTY_GIT_URL "https://github.com/mantidproject/thirdparty-msvc2015.git" ) - set(THIRD_PARTY_GIT_SHA1 b35c612466cc4b89804ec1b9c449546174a3317e) + set(THIRD_PARTY_GIT_SHA1 dfaaaa4dbb5c90127e6b3e540710a29856227447) set(THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty) # Generates a script to do the clone/update in tmp set(_project_name ThirdParty) diff --git a/scripts/Inelastic/QLdata_win64.cp38-win_amd64.pyd b/scripts/Inelastic/QLdata_win64.cp38-win_amd64.pyd index 68170025432c02fcf2e4375c7e8b808d121c18c0..31281bf2998411c215500aea09df9723c3b0c19e 100644 Binary files a/scripts/Inelastic/QLdata_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/QLdata_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/QLres_win64.cp38-win_amd64.pyd b/scripts/Inelastic/QLres_win64.cp38-win_amd64.pyd index a05effad32b68e5f8337836553e1ff9aea0ad4c7..2667721006f9fdef1b21288a0f177776395c1c4b 100644 Binary files a/scripts/Inelastic/QLres_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/QLres_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/QLse_win64.cp38-win_amd64.pyd b/scripts/Inelastic/QLse_win64.cp38-win_amd64.pyd index f26afeee8cf8c299bfdf934b0bc2a3a597c56b55..da481afd74ddb69fbabc1490c7c724bdb0e8b977 100644 Binary files a/scripts/Inelastic/QLse_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/QLse_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/Quest_win64.cp38-win_amd64.pyd b/scripts/Inelastic/Quest_win64.cp38-win_amd64.pyd index 7c02c7a842f4911c3279a8e0dbb9c929e4071d92..b7de0b197596593ae58159bb8eb8aa4156358813 100644 Binary files a/scripts/Inelastic/Quest_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/Quest_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/ResNorm_win64.cp38-win_amd64.pyd b/scripts/Inelastic/ResNorm_win64.cp38-win_amd64.pyd index 7daae32de8642e428ca5deecee245a8632d1e4b4..33ba44cd7170c691782ecbad3875776e463f4d16 100644 Binary files a/scripts/Inelastic/ResNorm_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/ResNorm_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/cylabs_win64.cp38-win_amd64.pyd b/scripts/Inelastic/cylabs_win64.cp38-win_amd64.pyd index 49f51382e30f7c123199b4f0509278381c81834a..c7a2193dbd2bce862e17c7fd99c519864d00fa6b 100644 Binary files a/scripts/Inelastic/cylabs_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/cylabs_win64.cp38-win_amd64.pyd differ diff --git a/scripts/Inelastic/muscat_win64.cp38-win_amd64.pyd b/scripts/Inelastic/muscat_win64.cp38-win_amd64.pyd index 7eeaf0122037daccf6b6212635df82bb91306d58..f37d545093334b912b49e6ab1601edece19e0601 100644 Binary files a/scripts/Inelastic/muscat_win64.cp38-win_amd64.pyd and b/scripts/Inelastic/muscat_win64.cp38-win_amd64.pyd differ