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

Revert part of r49504 by Genscher:

Browse Source 
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.
This commit is contained in:
Thomas Dinges
2012-08-04 11:39:16 +00:00
parent 4f410971c3
commit f50bae3259
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
CMakeLists.txt
View File

@@ -939,24 +939,17 @@ elseif(WIN32)
endif() endif()
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
set_lib_path(OPENEXR "openexr") if(MSVC10)
set_lib_path(OPENEXR_LIBPATH "openexr/lib") set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_LIBRARIES set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/vc2010/include)
${OPENEXR_LIBPATH}/Iex.lib set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
${OPENEXR_LIBPATH}/Half.lib set(OPENEXR_LIBPATH ${OPENEXR}/vc2010/lib)
${OPENEXR_LIBPATH}/IlmImf.lib else()
${OPENEXR_LIBPATH}/Imath.lib set(OPENEXR ${LIBDIR}/openexr)
${OPENEXR_LIBPATH}/IlmThread.lib set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
) set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set_lib_path(OPENEXR_INCUDE "openexr/include") set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_INCLUDE_DIRS endif()
${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)
@@ -1119,17 +1112,10 @@ elseif(WIN32)
endif() endif()
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
if(MSVC10) set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10) set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
else()
set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
endif() endif()
if(WITH_IMAGE_TIFF) if(WITH_IMAGE_TIFF)