[Bf-blender-cvs] [45a09de9ddf] master: Fix building with shared OIDN libraries

Sebastian Parborg noreply at git.blender.org
Mon Aug 19 15:21:43 CEST 2019


Commit: 45a09de9ddf2de1fb09e4939c4180dbf94f7c3df
Author: Sebastian Parborg
Date:   Mon Aug 19 15:19:41 2019 +0200
Branches: master
https://developer.blender.org/rB45a09de9ddf2de1fb09e4939c4180dbf94f7c3df

Fix building with shared OIDN libraries

Previously cmake would error out if it couldn't find the static
libraries even though it can build with shared libraries just fine.

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

M	build_files/cmake/Modules/FindOpenImageDenoise.cmake

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

diff --git a/build_files/cmake/Modules/FindOpenImageDenoise.cmake b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
index 85ba10b14e4..1ffbd052211 100644
--- a/build_files/cmake/Modules/FindOpenImageDenoise.cmake
+++ b/build_files/cmake/Modules/FindOpenImageDenoise.cmake
@@ -46,6 +46,10 @@ FIND_PATH(OPENIMAGEDENOISE_INCLUDE_DIR
 
 SET(_openimagedenoise_FIND_COMPONENTS
   OpenImageDenoise
+)
+
+# These are needed when building statically
+SET(_openimagedenoise_FIND_STATIC_COMPONENTS
   common
   mkldnn
 )
@@ -65,6 +69,23 @@ FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS})
   LIST(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()
 
+FOREACH(COMPONENT ${_openimagedenoise_FIND_STATIC_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  FIND_LIBRARY(openimagedenoise_${UPPERCOMPONENT}_LIBRARY
+    NAMES
+      ${COMPONENT}
+    HINTS
+      ${_openimagedenoise_SEARCH_DIRS}
+    PATH_SUFFIXES
+      lib64 lib
+    )
+  MARK_AS_ADVANCED(openimagedenoise_${UPPERCOMPONENT}_LIBRARY)
+  IF(openimagedenoise_${UPPERCOMPONENT}_LIBRARY)
+    LIST(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}")
+  ENDIF()
+ENDFOREACH()
+
 FIND_LIBRARY(OPENIMAGEDENOISE_LIBRARY
   NAMES
     OpenImageDenoise



More information about the Bf-blender-cvs mailing list