Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-09-13 17:05:59 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-09-13 17:09:24 +0300
commit5c10c92b23cfecb4ea1134ebe33837fb760eb0c9 (patch)
tree50027511eae7e71dc378b9aacb4130e63ca3cc34 /build_files
parent1a4aca1b6941a7cede14f2efc68c83fde20ba972 (diff)
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.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh1
1 files changed, 1 insertions, 0 deletions
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"