[Bf-blender-cvs] [66ad9ef2ce3] master: Fix OpenColorIO link errors in some Linux builds.

Brecht Van Lommel noreply at git.blender.org
Fri Sep 14 16:35:44 CEST 2018


Commit: 66ad9ef2ce3f646ad1cf177198a47365069f742a
Author: Brecht Van Lommel
Date:   Fri Sep 14 16:27:11 2018 +0200
Branches: master
https://developer.blender.org/rB66ad9ef2ce3f646ad1cf177198a47365069f742a

Fix OpenColorIO link errors in some Linux builds.

The library can get installed in a lib/static subdirectory, so search there
as well now.

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

M	build_files/cmake/Modules/FindOpenColorIO.cmake

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

diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake
index 1d26d6b0f86..218b5f721bc 100644
--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -60,7 +60,7 @@ FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS})
     HINTS
       ${_opencolorio_SEARCH_DIRS}
     PATH_SUFFIXES
-      lib64 lib
+      lib64 lib lib64/static lib/static
     )
   IF(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
     LIST(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}")



More information about the Bf-blender-cvs mailing list