[Bf-blender-cvs] [a7875c7] master: Fix linking error on VC 2013: Update lib names for openexr

Daniel Genrich noreply at git.blender.org
Wed Aug 13 09:14:12 CEST 2014


Commit: a7875c7c05ee15edf38047220f3c9fbe9835bc98
Author: Daniel Genrich
Date:   Wed Aug 13 09:14:05 2014 +0200
Branches: master
https://developer.blender.org/rBa7875c7c05ee15edf38047220f3c9fbe9835bc98

Fix linking error on VC 2013: Update lib names for openexr

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98115e0..1c063e2 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()




More information about the Bf-blender-cvs mailing list