diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-07 04:23:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-07 04:23:18 +0300 |
| commit | 6165508bc5f8abec6f27d1f25f5ecdeaf6fffd77 (patch) | |
| tree | dc6ab2b5f115758fb961507c1281fb0d49bbaebc /CMakeLists.txt | |
| parent | c9acbc6404e3c8419430a87d4081eba0d886ee42 (diff) | |
patch for building blender with CMake, OpenEXR & MSVC2010 by Peter K?\252mmel
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71a52c0c928..55bfb83a6e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |