diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLTK.cmake
--- cmake-3.6.1/Modules/FindFLTK.cmake	2016-07-22 23:50:22.000000000 +1000
+++ cmake-3.6.1-patched/Modules/FindFLTK.cmake	2016-08-26 20:14:13.339818656 +1000
@@ -92,9 +92,9 @@
   set( FLTK_PLATFORM_DEPENDENT_LIBS  "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
 endif()
 
-# If FLTK_INCLUDE_DIR is already defined we assigne its value to FLTK_DIR
-if(FLTK_INCLUDE_DIR)
-  set(FLTK_DIR ${FLTK_INCLUDE_DIR})
+# If FLTK_INCLUDE_DIRS is already defined we assigne its value to FLTK_DIR
+if(FLTK_INCLUDE_DIRS)
+  set(FLTK_DIR ${FLTK_INCLUDE_DIRS})
 endif()
 
 
@@ -128,6 +128,7 @@
     # Look in standard UNIX install locations.
     /usr/local/lib/fltk
     /usr/lib/fltk
+    /usr/lib64/fltk
     /usr/local/fltk
     /usr/X11R6/include
 
@@ -158,7 +159,7 @@
     endif()
     # mark_as_advanced(FLTK_FLUID_EXECUTABLE)
 
-    set(FLTK_INCLUDE_DIR ${FLTK_DIR})
+    set(FLTK_INCLUDE_DIRS ${FLTK_DIR})
     link_directories(${FLTK_LIBRARY_DIRS})
 
     set(FLTK_BASE_LIBRARY fltk)
@@ -166,14 +167,6 @@
     set(FLTK_FORMS_LIBRARY fltk_forms)
     set(FLTK_IMAGES_LIBRARY fltk_images)
 
-    # Add the extra libraries
-    load_cache(${FLTK_DIR}
-      READ_WITH_PREFIX
-      FL FLTK_USE_SYSTEM_JPEG
-      FL FLTK_USE_SYSTEM_PNG
-      FL FLTK_USE_SYSTEM_ZLIB
-      )
-
     set(FLTK_IMAGES_LIBS "")
     if(FLFLTK_USE_SYSTEM_JPEG)
       set(FLTK_IMAGES_LIBS ${FLTK_IMAGES_LIBS} fltk_jpeg)
@@ -191,7 +184,7 @@
 
     # if FLTK was not built using CMake
     # Find fluid executable.
-    find_program(FLTK_FLUID_EXECUTABLE fluid ${FLTK_INCLUDE_DIR}/fluid)
+    find_program(FLTK_FLUID_EXECUTABLE fluid /usr/bin/fluid)
 
     # Use location of fluid to help find everything else.
     set(FLTK_INCLUDE_SEARCH_PATH "")
@@ -212,7 +205,7 @@
       # Use fltk-config to generate a list of possible include directories
       find_program(FLTK_CONFIG_SCRIPT fltk-config PATHS ${FLTK_BIN_DIR})
       if(FLTK_CONFIG_SCRIPT)
-        if(NOT FLTK_INCLUDE_DIR)
+        if(NOT FLTK_INCLUDE_DIRS)
           exec_program(${FLTK_CONFIG_SCRIPT} ARGS --cxxflags OUTPUT_VARIABLE FLTK_CXXFLAGS)
           if(FLTK_CXXFLAGS)
             string(REGEX MATCHALL "-I[^ ]*" _fltk_temp_dirs ${FLTK_CXXFLAGS})
@@ -232,7 +225,7 @@
       ${_FLTK_POSSIBLE_INCLUDE_DIRS}
       )
 
-    find_path(FLTK_INCLUDE_DIR
+    find_path(FLTK_INCLUDE_DIRS
         NAMES FL/Fl.h FL/Fl.H    # fltk 1.1.9 has Fl.H (#8376)
         PATHS ${FLTK_INCLUDE_SEARCH_PATH})
 
@@ -250,7 +243,7 @@
     set(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
       /usr/local/fltk/lib
       /usr/X11R6/lib
-      ${FLTK_INCLUDE_DIR}/lib
+      ${FLTK_INCLUDE_DIRS}/lib
       ${_FLTK_POSSIBLE_LIBRARY_DIR}
       )
 
@@ -291,16 +284,16 @@
   endif()
   if(NOT FLTK_SKIP_OPENGL)
     list(APPEND FLTK_LIBRARIES ${FLTK_GL_LIBRARY} ${OPENGL_gl_LIBRARY})
-    list(APPEND FLTK_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
-    list(REMOVE_DUPLICATES FLTK_INCLUDE_DIR)
+    list(APPEND FLTK_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
+    list(REMOVE_DUPLICATES FLTK_INCLUDE_DIRS)
   endif()
   list(APPEND FLTK_LIBRARIES ${FLTK_BASE_LIBRARY})
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 if(FLTK_SKIP_FLUID)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIRS)
 else()
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR FLTK_FLUID_EXECUTABLE)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIRS FLTK_FLUID_EXECUTABLE)
 endif()
 
 if(FLTK_FOUND)
@@ -312,7 +305,7 @@
 
   # The following deprecated settings are for compatibility with CMake 1.4
   set (HAS_FLTK ${FLTK_FOUND})
-  set (FLTK_INCLUDE_PATH ${FLTK_INCLUDE_DIR})
+  set (FLTK_INCLUDE_PATH ${FLTK_INCLUDE_DIRS})
   set (FLTK_FLUID_EXE ${FLTK_FLUID_EXECUTABLE})
   set (FLTK_LIBRARY ${FLTK_LIBRARIES})
 endif()