diff options
Diffstat (limited to 'build_files/build_environment/install_deps.sh')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 61 |
1 files changed, 45 insertions, 16 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5d95bd359e1..dfa82fe4da4 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -25,7 +25,7 @@ ARGS=$( \ getopt \ -o s:i:t:h \ ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\ +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\ with-all,with-opencollada,with-jack,with-embree,\ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\ force-all,force-python,force-numpy,force-boost,\ @@ -106,11 +106,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --no-confirm Disable any interaction with user (suitable for automated run). - --use-cxx11 - Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch). - NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default - standard starting from this version). - --with-all By default, a number of optional and not-so-often needed libraries are not installed. This option will try to install them, at the cost of potential conflicts (depending on @@ -306,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 @@ -388,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 @@ -2793,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! @@ -2810,10 +2817,10 @@ install_DEB() { install_packages_DEB $_packages PRINT"" - SNDFILE_DEV="libsndfile1-dev" - check_package_DEB $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile1-dev" + check_package_DEB $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_DEB $SNDFILE_DEV + install_packages_DEB $LIBSNDFILE_DEV fi PRINT "" @@ -3426,10 +3433,10 @@ install_RPM() { fi PRINT"" - SNDFILE_DEV="libsndfile-devel" - check_package_RPM $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile-devel" + check_package_RPM $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_RPM $SNDFILE_DEV + install_packages_RPM $LIBSNDFILE_DEV fi if [ "$WITH_ALL" = true ]; then @@ -3444,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 @@ -3850,10 +3867,10 @@ install_ARCH() { install_packages_ARCH $_packages PRINT"" - SNDFILE_DEV="libsndfile" - check_package_ARCH $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile" + check_package_ARCH $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_ARCH $SNDFILE_DEV + install_packages_ARCH $LIBSNDFILE_DEV fi PRINT "" @@ -3892,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..." |