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:
authorRay Molenkamp <github@lazydodo.com>2020-06-25 13:44:39 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-25 14:00:58 +0300
commitd3283ef1210fe63f75a3b1a60efa3abe5763e6ad (patch)
tree60f7b19076a22ec4af7e019e2b17f3859dc5c702 /build_files/cmake/Modules
parent6431b113815e8faf92e26427f87dc2134c98fdc4 (diff)
Build: upgrade OpenImageDenoise to 1.2.1
This requires ISPC for building OpenImageDenoise, so that is now added as a dependency as well. Blender itself does not need ISPC for building so it is not included as part of the precompiled libraries. Differential Revision: https://developer.blender.org/D7641
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r--build_files/cmake/Modules/FindOpenImageDenoise.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
index b3d0dab3289..c7215d30e8a 100644
--- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake
+++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
@@ -48,7 +48,14 @@ SET(_openimagedenoise_FIND_COMPONENTS
# These are needed when building statically
SET(_openimagedenoise_FIND_STATIC_COMPONENTS
common
+
+ # These additional library names change between versions, we list all of them
+ # so builds work with multiple versions. Missing libraries are skipped.
+ dnnl_cpu
+ dnnl_common
+ dnnl_cpu # Second time because of circular dependency
mkldnn
+ dnnl
)
SET(_openimagedenoise_LIBRARIES)