diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-04-13 10:37:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-13 10:43:05 +0300 |
| commit | e9c548c3c3193f3a9cd45d78780efd8c9e2e9177 (patch) | |
| tree | f44d0b015554946f4e8b71e4368e39cb48000666 /build_files | |
| parent | 9b15c552cc125ff7b41ba81220c2072db6a46848 (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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) |