only use tiff/exr when enabled.

This commit is contained in:
Campbell Barton 2012-06-04 22:34:28 +00:00
parent 8db6e682e9
commit f94123a5c6

@ -1,3 +1,4 @@
set(Boost_DEBUG TRUE)
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@ -647,10 +648,17 @@ if(UNIX AND NOT APPLE)
find_package(OpenImageIO)
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere
set(OPENIMAGEIO_DEFINITIONS)
if(WITH_IMAGE_TIFF)
set(OPENIMAGEIO_LIBRARIES "${OPENIMAGEIO_LIBRARIES} ${TIFF_LIBRARY}")
endif()
if(WITH_IMAGE_OPENEXR)
set(OPENIMAGEIO_LIBRARIES "${OPENIMAGEIO_LIBRARIES} ${OPENEXR_LIBRARIES}")
endif()
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
set(WITH_CYCLES OFF)