From dd4d1870e64f97610c743a26de22cba7f78f2510 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 24 Oct 2022 23:14:52 -0500 Subject: [PATCH] Fail cmake when execute_process fails We have `set -euo pipefail` set in `version.sh`, but the `set -e` that would normally report errors up the chain doesn't end up having any effect, since `cmake` just ignores the errors and proceeds. Signed-off-by: Chandler Swift --- platform/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 36bed22608..2525f08771 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -89,11 +89,13 @@ else() # neither iPhone nor Android WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE OM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) execute_process(COMMAND tools/unix/version.sh qt_int_version WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE OM_INT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/platform_qt_version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/platform_qt_version.cpp"