From 0b9dd5668f1c090b820708b7b6144a3bd9b49729 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 23 Mar 2015 16:03:05 +0100 Subject: sync with upstream --- project/cmake/scripts/common/handle-depends.cmake | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'project/cmake/scripts/common/handle-depends.cmake') diff --git a/project/cmake/scripts/common/handle-depends.cmake b/project/cmake/scripts/common/handle-depends.cmake index b3bf3cd..4d78928 100644 --- a/project/cmake/scripts/common/handle-depends.cmake +++ b/project/cmake/scripts/common/handle-depends.cmake @@ -86,8 +86,26 @@ function(add_addon_depends addon searchpath) file(GLOB patches ${dir}/*.patch) list(SORT patches) foreach(patch ${patches}) + if(NOT PATCH_PROGRAM OR "${PATCH_PROGRAM}" STREQUAL "") + if(NOT PATCH_EXECUTABLE) + # find the path to the patch executable + find_program(PATCH_EXECUTABLE NAMES patch) + + if(NOT PATCH_EXECUTABLE) + message(FATAL_ERROR "Missing patch command (we looked in ${CMAKE_PREFIX_PATH})") + endif() + endif() + + # on windows "patch.exe" can only handle CR-LF line-endings so we + # need to force it to also handle LF-only line endings + set(PATCH_PROGRAM ${PATCH_EXECUTABLE}) + if(WIN32) + set(PATCH_PROGRAM "\"${PATCH_PROGRAM}\" --binary") + endif() + endif() + file(APPEND ${PATCH_FILE} - "execute_process(COMMAND patch -p1 -i ${patch})\n") + "execute_process(COMMAND ${PATCH_PROGRAM} -p1 -i \"${patch}\")\n") endforeach() -- cgit v1.2.3