diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-09-25 23:33:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-09-25 23:33:58 +0300 |
| commit | 7c1f329f286f464c77f970204a3b617ce6e56086 (patch) | |
| tree | c3d991a51e699ad764fcafd6773f239c494370ff /build_files | |
| parent | 77d809cd6b6f306c7c355ee3cf27aa20d4816b9b (diff) | |
| parent | 02b789642310f55845ef4e7facc7c2659815bb25 (diff) | |
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5a6aa5ca63e..2d839858b80 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -35,6 +35,8 @@ required-numpy: \ -- "$@" \ ) +COMMANDLINE=$@ + DISTRO="" RPM="" SRC="$HOME/src/blender-deps" @@ -2536,7 +2538,7 @@ install_RPM() { if $NUMPY_SKIP; then WARNING "Skipping NumPy installation, as requested..." else - check_package_version_match_RPM python3-numpy $NUMPY_VERSION_MIN + check_package_version_ge_RPM python3-numpy $NUMPY_VERSION_MIN if [ $? -eq 0 ]; then install_packages_RPM python3-numpy elif $NUMPY_REQUIRED; then @@ -3120,6 +3122,10 @@ print_info() { PRINT "Often, changes in the libs built by this script, or in your distro package, cannot be handled simply, so..." PRINT "" PRINT "" + PRINT "Ran with:" + PRINT " install_deps.sh $COMMANDLINE" + PRINT "" + PRINT "" PRINT "If you're using CMake add this to your configuration flags:" _buildargs="" |