[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38291] trunk/blender/CMakeLists.txt: -OpenEXR fixed so enabling if user has enabled

Antony Riakiotakis kalast at gmail.com
Sun Jul 10 22:04:57 CEST 2011


Revision: 38291
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38291
Author:   psy-fi
Date:     2011-07-10 20:04:56 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
-OpenEXR fixed so enabling if user has enabled
-Added Iex to lib list, was causing link time errors

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-07-10 18:54:02 UTC (rev 38290)
+++ trunk/blender/CMakeLists.txt	2011-07-10 20:04:56 UTC (rev 38291)
@@ -789,11 +789,8 @@
 		if(WITH_IMAGE_OPENEXR)
 			set(OPENEXR ${LIBDIR}/gcc/openexr)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
-			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
+			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-
-			# TODO, gives linking errors, force off
-			set(WITH_IMAGE_OPENEXR OFF)
 		endif()
 
 		if(WITH_IMAGE_TIFF)




More information about the Bf-blender-cvs mailing list