kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fail cmake when execute_process fails

Browse source 
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 <chandler@chandlerswift.com>
This commit is contained in:
Chandler Swift 2022-10-24 23:14:52 -05:00 • committed by Alexander Borsuk
parent 21219c40e7
commit dd4d1870e6
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/CMakeLists.txt
View file

@ -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"