Commit: 2fe7e70e928a80276bb4fbcfa9f32419d6c4baa7
Author: Bastien Montagne
Date:   Tue Oct 11 12:19:04 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB2fe7e70e928a80276bb4fbcfa9f32419d6c4baa7

install_deps: make c++11 building mandatory on blender2.8 branch.

===================================================================

M       build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh 
b/build_files/build_environment/install_deps.sh
index d6ea7d9..8588d23 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,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
@@ -104,11 +104,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
@@ -287,7 +282,7 @@ SUDO="sudo"
 
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=false
+USE_CXX11=true  # Mandatory in blender2.8
 
 PYTHON_VERSION="3.5.1"
 PYTHON_VERSION_MIN="3.5"
@@ -499,9 +494,6 @@ while true; do
     --no-confirm)
       NO_CONFIRM=true; shift; continue
     ;;
-    --use-cxx11)
-      USE_CXX11=true; shift; continue
-    ;;
     --with-all)
       WITH_ALL=true; shift; continue
     ;;
@@ -778,7 +770,7 @@ FFMPEG_SOURCE=( 
"http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2"; )
 
 CXXFLAGS_BACK=$CXXFLAGS
 if [ "$USE_CXX11" = true ]; then
-  WARNING "You are trying to use c++11, this *should* go smoothely with any 
very recent distribution
+  WARNING "C++11 is now mandatory for blender2.8, this *should* go smoothly 
with any very recent distribution.
 However, if you are experiencing linking errors (also when building Blender 
itself), please try the following:
     * Re-run this script with `--build-all --force-all` options.
     * Ensure your gcc version is at the very least 4.8, if possible you should 
really rather use gcc-5.1 or above.

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to