From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 19 Sep 2020 01:39:02 +0000 (-0700)
Subject: Check exit code from execute_process in run-and-compare cmake script.
X-Git-Tag: 1.9.9-b1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515e5f83a1c0673f494eb8b446019c134e91f623;p=thirdparty%2Fzlib-ng.git

Check exit code from execute_process in run-and-compare cmake script.
---

diff --git a/cmake/run-and-compare.cmake b/cmake/run-and-compare.cmake
index deeec1b2..2a6b14f0 100644
--- a/cmake/run-and-compare.cmake
+++ b/cmake/run-and-compare.cmake
@@ -9,16 +9,27 @@ if(INPUT)
         -DINPUT=${INPUT}
         -DOUTPUT=${OUTPUT}
         "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+        RESULT_VARIABLE CMD_RESULT)
 else()
     # Run command and redirect stdout to output
     execute_process(COMMAND ${CMAKE_COMMAND}
         "-DCOMMAND=${COMMAND}"
         -DOUTPUT=${OUTPUT}
         "-DSUCCESS_EXIT=${SUCCESS_EXIT}"
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake
+        RESULT_VARIABLE CMD_RESULT)
+endif()
+
+if(CMD_RESULT)
+    message(FATAL_ERROR "Run before compare failed: ${CMD_RESULT}")
 endif()
 
 # Compare that output is equal to specified file
 execute_process(COMMAND ${CMAKE_COMMAND}
-        -E compare_files ${COMPARE} ${OUTPUT})
\ No newline at end of file
+    -E compare_files ${COMPARE} ${OUTPUT}
+    RESULT_VARIABLE CMD_RESULT)
+
+if(CMD_RESULT)
+    message(FATAL_ERROR "Run compare failed: ${CMD_RESULT}")
+endif()
\ No newline at end of file