[Bf-blender-cvs] [5c10c92b23c] master: Fix building deps when OpenCV dev package is present.

Bastien Montagne noreply at git.blender.org
Thu Sep 13 16:09:35 CEST 2018


Commit: 5c10c92b23cfecb4ea1134ebe33837fb760eb0c9
Author: Bastien Montagne
Date:   Thu Sep 13 16:05:59 2018 +0200
Branches: master
https://developer.blender.org/rB5c10c92b23cfecb4ea1134ebe33837fb760eb0c9

Fix building deps when OpenCV dev package is present.

Since we are not linking against OpenCV ourselves, that generated
linking errors later on (while building OSL e.g.).
Those 'open' libs link against way too many other libs... :/

Thanks to @intrah for initial report (T56785), and @LazyDodo for
suggested solution.

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

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 b47c01d52cb..8c9105225f1 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1665,6 +1665,7 @@ compile_OIIO() {
     cmake_d="$cmake_d -D USE_QT=OFF"
     cmake_d="$cmake_d -D USE_PYTHON=OFF"
     cmake_d="$cmake_d -D USE_FFMPEG=OFF"
+    cmake_d="$cmake_d -D USE_OPENCV=OFF"
     cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
     cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"



More information about the Bf-blender-cvs mailing list