diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-02 18:21:25 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-02 18:21:25 +0400 |
| commit | dc67840db6c3cf0e73b93d36649219a85751a4f3 (patch) | |
| tree | 3570a4dcc4a114210a48d6720b4dece0dedf7f8b | |
| parent | ce3293b2d9907cadd7bd88d3b85d9923c4d83e7f (diff) | |
OpenEXR: Enable again for MSVC 2010
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 11 insertions, 7 deletions
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() |