[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59682] trunk/blender/intern/cycles/app/ CMakeLists.txt: Cycles:

[Thomas Dinges]

Revision: 59682
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59682
Author:   dingto
Date:     2013-08-31 02:56:03 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Cycles: 
* More build fixes, 2 link errors remain. http://www.pasteall.org/45279

Note: Probably those paths should only be added for Windows and Linux, as "OPENIMAGEIO_LIBPATH" already inherit them for Mac OS. Also "OPENIMAGEIO_LIBRARIES" inherits the libs for Linux already. Is that intended or a lack of consistency? 

Modified Paths:
--------------
    trunk/blender/intern/cycles/app/CMakeLists.txt

Modified: trunk/blender/intern/cycles/app/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/app/CMakeLists.txt	2013-08-31 02:25:43 UTC (rev 59681)
+++ trunk/blender/intern/cycles/app/CMakeLists.txt	2013-08-31 02:56:03 UTC (rev 59682)
@@ -24,13 +24,17 @@
 	${OPENGL_LIBRARIES}
 	${CYCLES_GLEW_LIBRARY}
 	${OPENIMAGEIO_LIBRARIES}
+	${PNG_LIBRARIES}
+	${JPEG_LIBRARIES}
+	${ZLIB_LIBRARIES}
+	${TIFF_LIBRARY}
 )
 
 if(WIN32)
 	list(APPEND LIBRARIES ${PTHREADS_LIBRARIES})
 endif()
 
-link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
+link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH} ${PNG_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH})
 
 if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
 	list(APPEND LIBRARIES ${GLUT_LIBRARIES})