1 files changed, 39 insertions, 24 deletions
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index d0c13d67..875797fd 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -7,32 +7,47 @@
 # also defined, but NOT for general use are
 #  TIFF_LIBRARY, where to find the TIFF library.
 
-FIND_PATH(TIFF_INCLUDE_DIR tiff.h
-  /usr/local/include
-  /usr/include
-)
+IF (CACHED_TIFF)
 
-set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
-FIND_LIBRARY(TIFF_LIBRARY
-  NAMES ${TIFF_NAMES}
-  PATHS /usr/lib /usr/local/lib
-)
+  # in cache already
+  IF ("${CACHED_TIFF}" STREQUAL "YES")
+    SET(TIFF_FOUND TRUE)
+  ENDIF ("${CACHED_TIFF}" STREQUAL "YES")
 
+ELSE (CACHED_TIFF)
 
-if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
-   set(TIFF_FOUND "YES")
-   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
-endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+  FIND_PATH(TIFF_INCLUDE_DIR tiff.h
+    /usr/local/include
+    /usr/include
+  )
+  
+  set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
+  FIND_LIBRARY(TIFF_LIBRARY
+    NAMES ${TIFF_NAMES}
+    PATHS /usr/lib /usr/local/lib
+  )
+  
+  
+  if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+     set(TIFF_FOUND TRUE)
+     set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
+     set(CACHED_TIFF "YES")
+  else (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+     set(CACHED_TIFF "NO")
+  endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+  
+  
+  if (TIFF_FOUND)
+     if (NOT TIFF_FIND_QUIETLY)
+        message(STATUS "Found TIFF: ${TIFF_LIBRARY}")
+     endif (NOT TIFF_FIND_QUIETLY)
+  else (TIFF_FOUND)
+     if (TIFF_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find TIFF")
+     endif (TIFF_FIND_REQUIRED)
+  endif (TIFF_FOUND)
 
+  set(CACHED_TIFF ${CACHED_TIFF} CACHE INTERNAL "If tiff was checked")
+  MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY)
 
-if (TIFF_FOUND)
-   if (NOT TIFF_FIND_QUIETLY)
-      message(STATUS "Found TIFF: ${TIFF_LIBRARY}")
-   endif (NOT TIFF_FIND_QUIETLY)
-else (TIFF_FOUND)
-   if (TIFF_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find TIFF")
-   endif (TIFF_FIND_REQUIRED)
-endif (TIFF_FOUND)
-
-MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY )
+ENDIF (CACHED_TIFF)