From dc67840db6c3cf0e73b93d36649219a85751a4f3 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Thu, 2 Aug 2012 14:21:25 +0000 Subject: OpenEXR: Enable again for MSVC 2010 --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 75cefd0c219..a3411176b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1122,10 +1122,17 @@ elseif(WIN32) 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 @@ endif() # 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() -- cgit v1.2.3