Skip to content

Commit

Permalink
Define CLANG_FORMAT_VERSION in install_deps.sh
Browse files Browse the repository at this point in the history
When running `./blender/build_files/build_environment/install_deps.sh` on Ubuntu 20.04.3 LTS the following error can be seen:
```
./blender/build_files/build_environment/install_deps.sh: line 1266: [: too many arguments
```
This error results from the call:
```
  check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION
```
with `CLANG_FORMAT_VERSION` being undefined.
Also as `clang-format` 13 is already released and hopefully didn't break anything `CLANG_FORMAT_VERSION_MEX` could use version bump.

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D13924
  • Loading branch information
Michael authored and Bastien Montagne committed Feb 15, 2022
1 parent 07032dd commit b22db23
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build_files/build_environment/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,9 @@ USE_CXX11=true
# XXX_VERSION_SHORT is used for various things, like preferred version (when distribution provides several of them),
# and to name shortcuts to built libraries' installation directories...

CLANG_FORMAT_VERSION="10.0"
CLANG_FORMAT_VERSION_MIN="6.0"
CLANG_FORMAT_VERSION_MEX="10.0"
CLANG_FORMAT_VERSION_MEX="14.0"

PYTHON_VERSION="3.10.2"
PYTHON_VERSION_SHORT="3.10"
Expand Down

0 comments on commit b22db23

Please sign in to comment.