Merge private branch.

This commit is contained in:
castano 2008-04-17 07:00:19 +00:00
parent 141a05edf4
commit bade8e5e09

View File

@ -1,11 +1,11 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
SUBDIRS(nvcore) SUBDIRS(nvcore)
SUBDIRS(nvmath) SUBDIRS(nvmath)
SUBDIRS(nvimage) SUBDIRS(nvimage)
SUBDIRS(nvtt) SUBDIRS(nvtt)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
# OpenGL # OpenGL
INCLUDE(FindOpenGL) INCLUDE(FindOpenGL)
IF(OPENGL_FOUND) IF(OPENGL_FOUND)
@ -84,6 +84,7 @@ ELSE(PNG_FOUND)
ENDIF(PNG_FOUND) ENDIF(PNG_FOUND)
# TIFF # TIFF
SET(TIFF_NAMES libtiff)
INCLUDE(FindTIFF) INCLUDE(FindTIFF)
IF(TIFF_FOUND) IF(TIFF_FOUND)
SET(HAVE_TIFF ${TIFF_FOUND} CACHE BOOL "Set to TRUE if TIFF is found, FALSE otherwise") SET(HAVE_TIFF ${TIFF_FOUND} CACHE BOOL "Set to TRUE if TIFF is found, FALSE otherwise")