Revision: 34677
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34677
Author: campbellbarton
Date: 2011-02-07 01:23:18 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
patch for building blender with CMake, OpenEXR & MSVC2010 by Peter K?\252mmel
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-02-07 01:13:21 UTC (rev 34676)
+++ trunk/blender/CMakeLists.txt 2011-02-07 01:23:18 UTC (rev 34677)
@@ -547,17 +547,24 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INC ${OPENEXR}/include
${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
if(MSVC80)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+ set(MSVC_LIB _vs2005)
+ set(MSVC_INC)
+ elseif(MSVC90)
+ set(MSVC_LIB _vs2008)
+ set(MSVC_INC)
+ elseif(MSVC10)
+ set(MSVC_LIB _vs2010)
+ set(MSVC_INC _vs2010)
else()
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+ set(MSVC_LIB msvc)
+ set(MSVC_INC)
endif()
- if(MSVC90)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
- endif()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+ set(OPENEXR_INC ${OPENEXR_INCUDE}/
${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
endif()
if(WITH_IMAGE_TIFF)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
