Merge branch 'master' into blender2.8
[blender.git] / build_files / build_environment / install_deps.sh
index c474c39d91050fdba8509f2af4b07fea82dca4a2..d590a80bcacea7ef9e68928b2c660070d1eabe3c 100755 (executable)
@@ -285,7 +285,7 @@ SUDO="sudo"
 
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=true  # Mandatory in blender2.8
+USE_CXX11=true
 
 PYTHON_VERSION="3.6.2"
 PYTHON_VERSION_MIN="3.6"
@@ -794,20 +794,10 @@ OPENCOLLADA_REPO_BRANCH="master"
 
 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
+# C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
-if [ "$USE_CXX11" = true ]; then
-  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.
-
-Please note that until the transition to C++11-built libraries if completed in your distribution, situation will
-remain fuzzy and incompatibilities may happen..."
-  PRINT ""
-  PRINT ""
-  CXXFLAGS="$CXXFLAGS -std=c++11"
-  export CXXFLAGS
-fi
+CXXFLAGS="$CXXFLAGS -std=c++11"
+export CXXFLAGS
 
 #### Show Dependencies ####
 
@@ -1682,9 +1672,7 @@ compile_OIIO() {
 #    fi
     cmake_d="$cmake_d -D USE_OCIO=OFF"
 
-    if [ "$USE_CXX11" = true ]; then
-      cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON"
-    fi
+    cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON"
 
     if file /bin/cp | grep -q '32-bit'; then
       cflags="-fPIC -m32 -march=i686"
@@ -1897,9 +1885,7 @@ compile_OSL() {
     cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
     cmake_d="$cmake_d -D USE_SIMD=sse2"
-    if [ "$USE_CXX11" = true ]; then
-        cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
-    fi
+    cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
 
     #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
 
@@ -2285,12 +2271,6 @@ compile_ALEMBIC() {
 
     cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst"
 
-    # Without Boost or TR1, Alembic requires C++11.
-    if [ "$USE_CXX11" != true ]; then
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON"
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF"
-    fi
-
     if [ -d $INST/boost ]; then
       if [ -d $INST/boost ]; then
         cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
@@ -4227,12 +4207,6 @@ print_info() {
   _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
   _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC*"
 
-  if [ "$USE_CXX11" = true ]; then
-    _1="-D WITH_CXX11=ON"
-    PRINT "  $_1"
-    _buildargs="$_buildargs $_1"
-  fi
-
   _1="-D WITH_CODEC_SNDFILE=ON"
   PRINT "  $_1"
   _buildargs="$_buildargs $_1"