[Bf-blender-cvs] [7574f90a717] master: Fix Cycles standalone build, needs OpenJPEG libraries with OIIO now.

Brecht Van Lommel noreply at git.blender.org
Tue Mar 26 15:29:08 CET 2019


Commit: 7574f90a71791dd3eca93c474cb766f679c0c3eb
Author: Brecht Van Lommel
Date:   Tue Mar 26 14:38:37 2019 +0100
Branches: master
https://developer.blender.org/rB7574f90a71791dd3eca93c474cb766f679c0c3eb

Fix Cycles standalone build, needs OpenJPEG libraries with OIIO now.

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

M	intern/cycles/app/CMakeLists.txt

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

diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 554c3c263ae..2d7db860b09 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -58,7 +58,8 @@ link_directories(${OPENIMAGEIO_LIBPATH}
                  ${JPEG_LIBPATH}
                  ${ZLIB_LIBPATH}
                  ${TIFF_LIBPATH}
-                 ${OPENEXR_LIBPATH})
+                 ${OPENEXR_LIBPATH}
+                 ${OPENJPEG_LIBPATH})
 
 if(WITH_OPENCOLORIO)
 	link_directories(${OPENCOLORIO_LIBPATH})
@@ -94,6 +95,7 @@ macro(cycles_target_link_libraries target)
 		${target}
 		${OPENIMAGEIO_LIBRARIES}
 		${OPENEXR_LIBRARIES}
+		${OPENJPEG_LIBRARIES}
 		${PUGIXML_LIBRARIES}
 		${BOOST_LIBRARIES}
 		${CMAKE_DL_LIBS}
@@ -151,6 +153,7 @@ if(WITH_CYCLES_CUBIN_COMPILER)
 			extern_cuew
 			${OPENIMAGEIO_LIBRARIES}
 			${OPENEXR_LIBRARIES}
+			${OPENJPEG_LIBRARIES}
 			${PUGIXML_LIBRARIES}
 			${BOOST_LIBRARIES}
 			${PLATFORM_LINKLIBS}



More information about the Bf-blender-cvs mailing list