From 1e5bdca69f7676b2dbcd64f0f44f31b12b337b7c Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Tue, 13 Dec 2016 13:45:04 +0100
Subject: sync with upstream

---
 project/cmake/scripts/common/PrepareEnv.cmake | 47 +++++----------------------
 1 file changed, 9 insertions(+), 38 deletions(-)

(limited to 'project/cmake/scripts/common/PrepareEnv.cmake')

diff --git a/project/cmake/scripts/common/PrepareEnv.cmake b/project/cmake/scripts/common/PrepareEnv.cmake
index 8e02382..51be739 100644
--- a/project/cmake/scripts/common/PrepareEnv.cmake
+++ b/project/cmake/scripts/common/PrepareEnv.cmake
@@ -51,43 +51,14 @@ foreach(binding ${bindings})
   configure_file(${CORE_SOURCE_DIR}/${header} ${APP_INCLUDE_DIR} COPYONLY)
 endforeach()
 
-### on windows we need a "patch" binary to be able to patch 3rd party sources
-if(WIN32)
-  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 "${PATCH_ARCHIVE_NAME}.zip")
-    set(PATCH_URL "${KODI_MIRROR}/build-deps/win32/${PATCH_ARCHIVE}")
-    set(PATCH_DOWNLOAD ${BUILD_DIR}/download/${PATCH_ARCHIVE})
+### processing additional tools required by the platform
+if(EXISTS ${CORE_SOURCE_DIR}/project/cmake/scripts/${CORE_SYSTEM_NAME}/tools/)
+  file(GLOB platform_tools ${CORE_SOURCE_DIR}/project/cmake/scripts/${CORE_SYSTEM_NAME}/tools/*.cmake)
+  foreach(platform_tool ${platform_tools})
+    get_filename_component(platform_tool_name ${platform_tool} NAME_WE)
+    message(STATUS "Processing ${CORE_SYSTEM_NAME} specific tool: ${platform_tool_name}")
 
-    # download the archive containing patch.exe
-    message(STATUS "Downloading patch utility from ${PATCH_URL}...")
-    file(DOWNLOAD "${PATCH_URL}" "${PATCH_DOWNLOAD}" STATUS PATCH_DL_STATUS LOG PATCH_LOG SHOW_PROGRESS)
-    list(GET PATCH_DL_STATUS 0 PATCH_RETCODE)
-    if(NOT ${PATCH_RETCODE} EQUAL 0)
-      message(FATAL_ERROR "ERROR downloading ${PATCH_URL} - status: ${PATCH_DL_STATUS} log: ${PATCH_LOG}")
-    endif()
-
-    # extract the archive containing patch.exe
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzvf ${PATCH_DOWNLOAD}
-                    WORKING_DIRECTORY ${BUILD_DIR})
-
-    # make sure the extraction worked and that patch.exe is there
-    set(PATCH_PATH ${BUILD_DIR}/${PATCH_ARCHIVE_NAME})
-    set(PATCH_BINARY_PATH ${PATCH_PATH}/bin/patch.exe)
-    if(NOT EXISTS ${PATCH_PATH} OR NOT EXISTS ${PATCH_BINARY_PATH})
-      message(FATAL_ERROR "ERROR extracting patch utility from ${PATCH_DOWNLOAD_DIR}")
-    endif()
-
-    # copy patch.exe into the output directory
-    file(INSTALL ${PATCH_BINARY_PATH} DESTINATION ${ADDON_DEPENDS_PATH}/bin)
-
-    # make sure that cmake can find the copied patch.exe
-    find_program(PATCH_FOUND NAMES patch patch.exe)
-    if(NOT PATCH_FOUND)
-      message(FATAL_ERROR "ERROR installing patch utility from ${PATCH_BINARY_PATH} to ${ADDON_DEPENDS_PATH}/bin")
-    endif()
-  endif()
+    # include the file
+    include(${platform_tool})
+  endforeach()
 endif()
-- 
cgit v1.2.3