Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2014-08-13 11:14:05 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2014-08-13 11:14:05 +0400
commita7875c7c05ee15edf38047220f3c9fbe9835bc98 (patch)
treef8e108a7a04e2b05a2c72aacf6afbbaa77311d84 /CMakeLists.txt
parent818a036c1af2792d78069b70ef8e5f6423c348cf (diff)
Fix linking error on VC 2013: Update lib names for openexr
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt24
1 files changed, 17 insertions, 7 deletions
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()