Merge private branch.

16 years ago · bade8e5e09
parent 141a05edf4
commit bade8e5e09
1 changed files with 3 additions and 2 deletions
--- 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")