From bade8e5e09cd43b51883924be7d16965597515d2 Mon Sep 17 00:00:00 2001 From: castano Date: Thu, 17 Apr 2008 07:00:19 +0000 Subject: [PATCH] Merge private branch. --- src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0da13fd..cd79036 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,11 +1,11 @@ +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + SUBDIRS(nvcore) SUBDIRS(nvmath) SUBDIRS(nvimage) SUBDIRS(nvtt) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - # OpenGL INCLUDE(FindOpenGL) IF(OPENGL_FOUND) @@ -84,6 +84,7 @@ ELSE(PNG_FOUND) ENDIF(PNG_FOUND) # TIFF +SET(TIFF_NAMES libtiff) INCLUDE(FindTIFF) IF(TIFF_FOUND) SET(HAVE_TIFF ${TIFF_FOUND} CACHE BOOL "Set to TRUE if TIFF is found, FALSE otherwise")