[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51274] trunk/blender/CMakeLists.txt: OSX/ cmake: after osl librenew with globals patch, forcing oiio is not longer needed

[jens verwiebe]

Revision: 51274
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51274
Author:   jensverwiebe
Date:     2012-10-11 10:15:37 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
OSX/cmake: after osl librenew with globals patch, forcing oiio is not longer 
needed

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2012-10-11 09:53:17 UTC (rev 51273)
+++ trunk/blender/CMakeLists.txt        2012-10-11 10:15:37 UTC (rev 51274)
@@ -1609,7 +1609,7 @@
        if(WITH_OPENIMAGEIO)
                set(OPENIMAGEIO ${LIBDIR}/openimageio)
                set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-               set(OPENIMAGEIO_LIBRARIES -force_load 
${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} 
${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
+               set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO}/lib/libOpenImageIO.a 
${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} 
${ZLIB_LIBRARIES})
                set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} 
${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
                set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
        endif()

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs