forked from bartvdbraak/blender
patch for building blender with CMake, OpenEXR & MSVC2010 by Peter K?\252mmel
This commit is contained in:
parent
c9acbc6404
commit
6165508bc5
@ -547,17 +547,24 @@ elseif(WIN32)
|
||||
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)
|
||||
endif()
|
||||
if(MSVC90)
|
||||
set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
|
||||
set(MSVC_LIB msvc)
|
||||
set(MSVC_INC)
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user