--- a/CMakeModules/FindTIFF.cmake
+++ b/CMakeModules/FindTIFF.cmake
@@ -17,6 +17,7 @@
 FIND_PATH(TIFF_INCLUDE_DIR tiff.h
   /usr/local/include
   /usr/include
+  ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
   ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
   ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
   ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
@@ -31,7 +32,8 @@
 # and the import library libtiff_i for dynamic build
   find_library(TIFF_LIBRARIES
     NAMES libtiff_i
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
+          ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
   )
@@ -39,7 +41,8 @@
   find_library_with_debug(TIFF_LIBRARIES
     WIN32_DEBUG_POSTFIX d
     NAMES tiff libtiff wxtiff
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
+          ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
           ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff