From a7875c7c05ee15edf38047220f3c9fbe9835bc98 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Wed, 13 Aug 2014 09:14:05 +0200 Subject: Fix linking error on VC 2013: Update lib names for openexr --- CMakeLists.txt | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 98115e08d60..1c063e24174 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1198,13 +1198,23 @@ elseif(WIN32) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR) set(OPENEXR_LIBPATH ${OPENEXR}/lib) - set(OPENEXR_LIBRARIES - ${OPENEXR_LIBPATH}/Iex.lib - ${OPENEXR_LIBPATH}/Half.lib - ${OPENEXR_LIBPATH}/IlmImf.lib - ${OPENEXR_LIBPATH}/Imath.lib - ${OPENEXR_LIBPATH}/IlmThread.lib - ) + if(MSVC12) + set(OPENEXR_LIBRARIES + ${OPENEXR_LIBPATH}/Iex-2_1.lib + ${OPENEXR_LIBPATH}/Half.lib + ${OPENEXR_LIBPATH}/IlmImf-2_1.lib + ${OPENEXR_LIBPATH}/Imath-2_1.lib + ${OPENEXR_LIBPATH}/IlmThread-2_1.lib + ) + else() + set(OPENEXR_LIBRARIES + ${OPENEXR_LIBPATH}/Iex.lib + ${OPENEXR_LIBPATH}/Half.lib + ${OPENEXR_LIBPATH}/IlmImf.lib + ${OPENEXR_LIBPATH}/Imath.lib + ${OPENEXR_LIBPATH}/IlmThread.lib + ) + endif() endif(NOT OPENEXR_FOUND) endif() -- cgit v1.2.3