From e9c548c3c3193f3a9cd45d78780efd8c9e2e9177 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 13 Apr 2021 17:37:59 +1000 Subject: CMake: fix error building with the version set to 300 When Blender's minor version was single digits, it wasn't properly extracted. Resolve by adding zero padding. Issue raised by @harley in D10954. --- build_files/cmake/macros.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build_files') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 813ac013cdf..91881441c95 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -923,6 +923,10 @@ function(get_blender_version) math(EXPR _out_version_major "${_out_version} / 100") math(EXPR _out_version_minor "${_out_version} % 100") + # Zero pad the minor version so `_out_version_minor` is always two characters. + # This is needed if the minor version is a single digit. + string(REGEX REPLACE "^([0-9])$" "0\\1" _out_version_minor "${_out_version_minor}") + # output vars set(BLENDER_VERSION "${_out_version_major}.${_out_version_minor}" PARENT_SCOPE) set(BLENDER_VERSION_MAJOR "${_out_version_major}" PARENT_SCOPE) -- cgit v1.2.3