From 4488064f81d58c34d329bb2ebdd589c3349cdd91 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 18 Oct 2016 16:17:47 -0700
Subject: [vcpkg_apply_patches] Check if patch was properly applied

---
 scripts/cmake/vcpkg_apply_patches.cmake | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake
index 939edbd14..42f7a84f9 100644
--- a/scripts/cmake/vcpkg_apply_patches.cmake
+++ b/scripts/cmake/vcpkg_apply_patches.cmake
@@ -13,6 +13,15 @@ function(vcpkg_apply_patches)
             WORKING_DIRECTORY ${_ap_SOURCE_PATH}
             RESULT_VARIABLE error_code
         )
+        
+        if(error_code)
+            message(FATAL_ERROR
+                "Applying patch failed: ${GIT} --work-tree=. apply \"${PATCH}\" --ignore-whitespace --whitespace=nowarn --verbose\n"
+                "See logs for more information:\n"
+                "    ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log\n"
+                "    ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log\n")
+        endif()
+
         message(STATUS "Applying patch ${PATCH} done")
         math(EXPR PATCHNUM "${PATCHNUM}+1")
     endforeach()
-- 
cgit v1.2.3