diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-21 16:10:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-21 16:12:30 +0300 |
| commit | 19dc7f7fdfc996f7cb68f3f5269c9ce7b839a005 (patch) | |
| tree | 9c3065fe16e63e1954e0cfb0aaf46c4015c25b0b /build_files | |
| parent | dd1132416e5bcbad5d4f80631b1a9f3152a514ee (diff) | |
Install_deps: add clang-format packages.
Even though that one is not really useful just to build Blender, we can
as well explicitely include it here, since all 'default' Blender builds
will include full clang/llvm stack anyway (for Cycles and deps)...
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index b480f4a9c4e..7203719fe2c 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -301,6 +301,8 @@ NO_BUILD=false NO_CONFIRM=false USE_CXX11=true +CLANG_FORMAT_VERSION_MIN="6.0" + PYTHON_VERSION="3.7.0" PYTHON_VERSION_MIN="3.7" PYTHON_FORCE_BUILD=false @@ -383,7 +385,6 @@ OPENCOLLADA_FORCE_BUILD=false OPENCOLLADA_FORCE_REBUILD=false OPENCOLLADA_SKIP=false - EMBREE_VERSION="3.2.4" EMBREE_FORCE_BUILD=false EMBREE_FORCE_REBUILD=false @@ -2788,6 +2789,17 @@ install_DEB() { PRINT "" fi + PRINT "" + CLANG_FORMAT="clang-format" + check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN + if [ $? -eq 0 ]; then + _packages="$_packages $CLANG_FORMAT" + else + PRINT "" + WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..." + PRINT "" + fi + if [ "$WITH_JACK" = true ]; then _packages="$_packages libspnav-dev" # Only install jack if jack2 is not already installed! @@ -3439,6 +3451,16 @@ install_RPM() { install_packages_RPM libspnav-devel fi + PRINT "" + CLANG_FORMAT="clang" # Yeah, on fedora/suse clang-format is part of main clang package... + check_package_version_ge_RPM $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN + if [ $? -eq 0 ]; then + install_packages_RPM $CLANG_FORMAT + else + PRINT "" + WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..." + PRINT "" + fi PRINT "" _do_compile_python=false @@ -3887,6 +3909,18 @@ install_ARCH() { PRINT "" + CLANG_FORMAT="clang" # Yeah, on arch clang-format is part of main clang package... + check_package_version_ge_ARCH $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN + if [ $? -eq 0 ]; then + install_packages_ARCH $CLANG_FORMAT + else + PRINT "" + WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..." + PRINT "" + fi + + + PRINT "" _do_compile_python=false if [ "$PYTHON_SKIP" = true ]; then WARNING "Skipping Python installation, as requested..." |