Revision: 49504
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49504
Author: genscher
Date: 2012-08-02 14:21:25 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
OpenEXR: Enable again for MSVC 2010
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-08-02 14:20:44 UTC (rev 49503)
+++ trunk/blender/CMakeLists.txt 2012-08-02 14:21:25 UTC (rev 49504)
@@ -1122,10 +1122,17 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ if(MSVC10)
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS
${OPENEXR}/include/vc_10)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath
IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
+ else()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath
IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ endif()
endif()
if(WITH_IMAGE_TIFF)
@@ -1651,9 +1658,6 @@
# MSVC2010 fails to links C++ libs right
if(MSVC10)
- if(WITH_IMAGE_OPENEXR)
- message(WARNING "MSVC 2010 does not support OpenEXR, disabling
WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
- endif()
if(WITH_OPENCOLLADA)
message(WARNING "MSVC 2010 does not support OpenCollada,
disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
