diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-03-18 10:03:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 10:03:20 +0100 |
| commit | da3fc051ca57ebebc5e03b64d29340c01dd1e8d1 (patch) | |
| tree | f7ef4cfe1ecaa8b5ae5f0e4c21eeae189ad8b7ee | |
| parent | 33700e0b57beaf512567b754db9e989208b53690 (diff) | |
| parent | 3670f4c4507b2eb50dbb711b935c2c11ea6cf107 (diff) | |
Merge pull request #13663 from afedchin/win-patch-upd
windows: update patch utility to 2.7.6
| -rw-r--r-- | cmake/scripts/windows/tools/patch.cmake | 7 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/tools/patch.cmake | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/cmake/scripts/windows/tools/patch.cmake b/cmake/scripts/windows/tools/patch.cmake index 0a342fa1b3..b955b4cdcf 100644 --- a/cmake/scripts/windows/tools/patch.cmake +++ b/cmake/scripts/windows/tools/patch.cmake @@ -2,7 +2,7 @@ find_program(PATCH_FOUND NAMES patch patch.exe) if(PATCH_FOUND) message(STATUS "patch utility found at ${PATCH_FOUND}") else() - set(PATCH_ARCHIVE_NAME "patch-2.5.9-7-bin-3") + set(PATCH_ARCHIVE_NAME "patch-2.7.6-bin") set(PATCH_ARCHIVE "${PATCH_ARCHIVE_NAME}.zip") set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}") set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE}) @@ -28,6 +28,11 @@ else() # copy patch.exe into the output directory file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${ADDON_DEPENDS_PATH}/bin) + # copy patch depends + file(GLOB PATCH_BINARIES ${PATCH_PATH}/bin/*.dll) + if(NOT "${PATCH_BINARIES}" STREQUAL "") + file(INSTALL ${PATCH_BINARIES} DESTINATION ${ADDON_DEPENDS_PATH}/bin) + endif() # make sure that cmake can find the copied patch.exe find_program(PATCH_FOUND NAMES patch patch.exe) diff --git a/cmake/scripts/windowsstore/tools/patch.cmake b/cmake/scripts/windowsstore/tools/patch.cmake index 0a342fa1b3..b955b4cdcf 100644 --- a/cmake/scripts/windowsstore/tools/patch.cmake +++ b/cmake/scripts/windowsstore/tools/patch.cmake @@ -2,7 +2,7 @@ find_program(PATCH_FOUND NAMES patch patch.exe) if(PATCH_FOUND) message(STATUS "patch utility found at ${PATCH_FOUND}") else() - set(PATCH_ARCHIVE_NAME "patch-2.5.9-7-bin-3") + set(PATCH_ARCHIVE_NAME "patch-2.7.6-bin") set(PATCH_ARCHIVE "${PATCH_ARCHIVE_NAME}.zip") set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}") set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE}) @@ -28,6 +28,11 @@ else() # copy patch.exe into the output directory file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${ADDON_DEPENDS_PATH}/bin) + # copy patch depends + file(GLOB PATCH_BINARIES ${PATCH_PATH}/bin/*.dll) + if(NOT "${PATCH_BINARIES}" STREQUAL "") + file(INSTALL ${PATCH_BINARIES} DESTINATION ${ADDON_DEPENDS_PATH}/bin) + endif() # make sure that cmake can find the copied patch.exe find_program(PATCH_FOUND NAMES patch patch.exe) |