[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37510] trunk/blender: use full library paths for openexr & msvc, also remove unneeded exr includes

Campbell Barton ideasman42 at gmail.com
Wed Jun 15 15:54:57 CEST 2011


Revision: 37510
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37510
Author:   campbellbarton
Date:     2011-06-15 13:54:57 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
use full library paths for openexr & msvc, also remove unneeded exr includes

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-06-15 13:42:02 UTC (rev 37509)
+++ trunk/blender/CMakeLists.txt	2011-06-15 13:54:57 UTC (rev 37510)
@@ -628,10 +628,7 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			if(MSVC80)
-				set(MSVC_LIB _vs2005)
-				set(MSVC_INC)
-			elseif(MSVC90)
+			if(MSVC90)
 				set(MSVC_LIB _vs2008)
 				set(MSVC_INC)
 			elseif(MSVC10)
@@ -641,11 +638,24 @@
 				set(MSVC_LIB msvc)
 				set(MSVC_INC)
 			endif()
-			set(OPENEXR ${LIBDIR}/openexr)			
-			set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
+			set(OPENEXR ${LIBDIR}/openexr)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+			set(OPENEXR_LIBRARIES
+				${OPENEXR_LIBPATH}/Iex.lib
+				${OPENEXR_LIBPATH}/Half.lib
+				${OPENEXR_LIBPATH}/IlmImf.lib
+				${OPENEXR_LIBPATH}/Imath.lib
+				${OPENEXR_LIBPATH}/IlmThread.lib
+			)
 			set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
-			set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCUDE}/ ${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
+			set(OPENEXR_INCLUDE_DIRS
+				${OPENEXR_INCUDE}
+			        ${OPENEXR_INCUDE}/IlmImf
+				${OPENEXR_INCUDE}/Iex
+				${OPENEXR_INCUDE}/Imath
+			)
+			unset(OPENEXR_INCUDE)
+			unset(OPENEXR_LIBPATH)
 		endif()
 
 		if(WITH_IMAGE_TIFF)
@@ -744,7 +754,7 @@
 
 		if(WITH_IMAGE_OPENEXR)
 			set(OPENEXR ${LIBDIR}/gcc/openexr)
-			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
+			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 
@@ -877,7 +887,7 @@
 
 	if(WITH_IMAGE_OPENEXR)
 		set(OPENEXR ${LIBDIR}/openexr)
-		set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
+		set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 		set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
 		set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	endif()

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-06-15 13:42:02 UTC (rev 37509)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-06-15 13:54:57 UTC (rev 37510)
@@ -214,14 +214,15 @@
 	if(WITH_IMAGE_TIFF)
 		target_link_libraries(${target} ${TIFF_LIBRARY})
 	endif()
-	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)
 			foreach(_LOOP_VAR ${OPENEXR_LIBRARIES})
+				string(REGEX REPLACE ".lib$" "_d.lib" _LOOP_VAR_DEBUG ${_LOOP_VAR})
 				target_link_libraries(${target}
-						debug ${_LOOP_VAR}_d
+						debug ${_LOOP_VAR_DEBUG}
 						optimized ${_LOOP_VAR})
 			endforeach()
 			unset(_LOOP_VAR)
+			unset(_LOOP_VAR_DEBUG)
 		else()
 			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 		endif()




More information about the Bf-blender-cvs mailing list