diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-15 17:54:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-15 17:54:57 +0400 |
| commit | c02121b7080533c73625180ad850d145ba639378 (patch) | |
| tree | 4ca959fa74f57167bfa1d0a2097693f78c092e59 /CMakeLists.txt | |
| parent | bb6e0834e0f55070e4406ca4d385c9e6dc246655 (diff) | |
use full library paths for openexr & msvc, also remove unneeded exr includes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cca34fca36e..f767b2c3e3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -628,10 +628,7 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(WIN32) 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 @@ elseif(APPLE) 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() |