Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use full library paths for openexr & msvc, also remove unneeded exr includes

Browse Source
This commit is contained in:
Campbell Barton
2011-06-15 13:54:57 +00:00
parent bb6e0834e0
commit c02121b708
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@@ -628,10 +628,7 @@ elseif(WIN32)
endif() endif()
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
if(MSVC80) if(MSVC90)
set(MSVC_LIB _vs2005)
set(MSVC_INC)
elseif(MSVC90)
set(MSVC_LIB _vs2008) set(MSVC_LIB _vs2008)
set(MSVC_INC) set(MSVC_INC)
elseif(MSVC10) elseif(MSVC10)
@@ -641,11 +638,24 @@ elseif(WIN32)
set(MSVC_LIB msvc) set(MSVC_LIB msvc)
set(MSVC_INC) set(MSVC_INC)
endif() endif()
set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB}) 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_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() endif()
if(WITH_IMAGE_TIFF) if(WITH_IMAGE_TIFF)
@@ -744,7 +754,7 @@ elseif(WIN32)
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/gcc/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_LIBRARIES Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -877,7 +887,7 @@ elseif(APPLE)
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/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_LIBRARIES Iex Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif() endif()

5
build_files/cmake/macros.cmake
View File

@@ -214,14 +214,15 @@ macro(setup_liblinks
if(WITH_IMAGE_TIFF) if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY}) target_link_libraries(${target} ${TIFF_LIBRARY})
endif() endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX) if(WIN32 AND NOT UNIX)
foreach(_LOOP_VAR ${OPENEXR_LIBRARIES}) foreach(_LOOP_VAR ${OPENEXR_LIBRARIES})
string(REGEX REPLACE ".lib$" "_d.lib" _LOOP_VAR_DEBUG ${_LOOP_VAR})
target_link_libraries(${target} target_link_libraries(${target}
debug ${_LOOP_VAR}_d debug ${_LOOP_VAR_DEBUG}
optimized ${_LOOP_VAR}) optimized ${_LOOP_VAR})
endforeach() endforeach()
unset(_LOOP_VAR) unset(_LOOP_VAR)
unset(_LOOP_VAR_DEBUG)
else() else()
target_link_libraries(${target} ${OPENEXR_LIBRARIES}) target_link_libraries(${target} ${OPENEXR_LIBRARIES})
endif() endif()