CMake: refactor and reformat CMake files

- raise minimum CMake version from 2.6.3 to 3.2.3 (Jun 01, 2015)
- indent all CMake files according to the CMP (2 col.)
- refactor FLTK version number definitions and usage
- unify CMake and autoconf/configure variable names:
  - FL_VERSION -> FLTK_VERSION
  - FL_MAJOR_VERSION -> FLTK_VERSION_MAJOR
  - etc. for _MINOR_ and _PATCH_, respectively
  - note: this does not affect FL_VERSION etc. in source code
- generate "export headers" for all libraries (experimental: OFF)
- port some forgotten goodies from branch-1.3 to master
- merge and improve macro 'create_example' (WIP)
- remove "temporary" options and code for older CMake versions
- include and use 'GenerateExportHeader' (experimental, WIP: OFF)
  - note: created header files are not yet used
- build only *one* DLL with Visual Studio (tested, works)
  - similar to the bundled IDE projects in 1.3.x
- add some dynamically linked test/demo programs ('*-shared')
  if shared libraries are built (WIP)
- split 'macros.cmake': use one file per macro

1 files changed, 224 insertions, 245 deletions

diff --git a/CMake/options.cmake b/CMake/options.cmake
index 63412ebc3..0c13fa9a6 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -23,49 +23,33 @@ if (DEBUG_OPTIONS_CMAKE)
 endif (DEBUG_OPTIONS_CMAKE)
 
 #######################################################################
-# *Temporary* option to modify header file searches
-#######################################################################
-# Note: The old, deprecated behavior (ON) was to use find_file() for
-# header searches, the new behavior (ON) is to use check_include_files()
-# which seems to be more reliable but more difficult to set up and
-# slower because it uses a compilation test. Default is "new" (OFF).
-# This option should be removed as soon as the new search strategy
-# is considered stable.
-# Currently used only in resources.cmake.
-#######################################################################
-option(USE_FIND_FILE
-  "Deprecated: use find_file() for header searches. Should be OFF."
-  OFF
-)
-mark_as_advanced(USE_FIND_FILE)
-
-#######################################################################
 # options
 #######################################################################
-set(OPTION_OPTIM ""
-   CACHE STRING
-   "custom optimization flags"
-   )
-add_definitions(${OPTION_OPTIM})
+set (OPTION_OPTIM ""
+  CACHE STRING
+  "custom optimization flags"
+)
+add_definitions (${OPTION_OPTIM})
 
 #######################################################################
-set(OPTION_ARCHFLAGS ""
-   CACHE STRING
-   "custom architecture flags"
-   )
-add_definitions(${OPTION_ARCHFLAGS})
+set (OPTION_ARCHFLAGS ""
+  CACHE STRING
+  "custom architecture flags"
+  )
+add_definitions (${OPTION_ARCHFLAGS})
 
 #######################################################################
-set(OPTION_ABI_VERSION ""
-   CACHE STRING
-   "FLTK ABI Version FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)"
-   )
-set(FL_ABI_VERSION ${OPTION_ABI_VERSION})
+set (OPTION_ABI_VERSION ""
+  CACHE STRING
+  "FLTK ABI Version FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)"
+  )
+set (FL_ABI_VERSION ${OPTION_ABI_VERSION})
 
 #######################################################################
 #######################################################################
 if (UNIX)
-  option(OPTION_CREATE_LINKS "create backwards compatibility links" OFF)
+  option (OPTION_CREATE_LINKS "create backwards compatibility links" OFF)
+  list (APPEND FLTK_LDLIBS -lm)
 endif (UNIX)
 
 #######################################################################
@@ -107,105 +91,105 @@ if (OPTION_APPLE_SDL)
 endif (OPTION_APPLE_SDL)
 
 #######################################################################
-option(OPTION_USE_POLL "use poll if available" OFF)
-mark_as_advanced(OPTION_USE_POLL)
+option (OPTION_USE_POLL "use poll if available" OFF)
+mark_as_advanced (OPTION_USE_POLL)
 
-if(OPTION_USE_POLL)
-   CHECK_FUNCTION_EXISTS(poll USE_POLL)
-endif(OPTION_USE_POLL)
+if (OPTION_USE_POLL)
+  CHECK_FUNCTION_EXISTS(poll USE_POLL)
+endif (OPTION_USE_POLL)
 
 #######################################################################
-option(OPTION_BUILD_SHARED_LIBS
-    "Build shared libraries(in addition to static libraries)"
-    OFF
-    )
+option (OPTION_BUILD_SHARED_LIBS
+  "Build shared libraries(in addition to static libraries)"
+  OFF
+  )
 
 #######################################################################
-option(OPTION_BUILD_EXAMPLES "build example programs" ON)
-option(OPTION_PRINT_SUPPORT "allow print support" ON)
-option(OPTION_FILESYSTEM_SUPPORT "allow file system support" ON)
+option (OPTION_BUILD_EXAMPLES "build example programs" ON)
+option (OPTION_PRINT_SUPPORT "allow print support" ON)
+option (OPTION_FILESYSTEM_SUPPORT "allow file system support" ON)
 
 #######################################################################
 if (DOXYGEN_FOUND)
-    option(OPTION_BUILD_HTML_DOCUMENTATION "build html docs" ON)
-    option(OPTION_INSTALL_HTML_DOCUMENTATION "install html docs" OFF)
+  option (OPTION_BUILD_HTML_DOCUMENTATION "build html docs" ON)
+  option (OPTION_INSTALL_HTML_DOCUMENTATION "install html docs" OFF)
 
-    option(OPTION_INCLUDE_DRIVER_DOCUMENTATION "include driver (developer) docs" OFF)
-    mark_as_advanced(OPTION_INCLUDE_DRIVER_DOCUMENTATION)
+  option (OPTION_INCLUDE_DRIVER_DOCUMENTATION "include driver (developer) docs" OFF)
+  mark_as_advanced (OPTION_INCLUDE_DRIVER_DOCUMENTATION)
 
-    if (LATEX_FOUND)
-      option(OPTION_BUILD_PDF_DOCUMENTATION "build pdf docs" ON)
-      option(OPTION_INSTALL_PDF_DOCUMENTATION "install pdf docs" OFF)
-    endif (LATEX_FOUND)
+  if (LATEX_FOUND)
+    option (OPTION_BUILD_PDF_DOCUMENTATION "build pdf docs" ON)
+    option (OPTION_INSTALL_PDF_DOCUMENTATION "install pdf docs" OFF)
+  endif (LATEX_FOUND)
 endif (DOXYGEN_FOUND)
 
-if(OPTION_BUILD_HTML_DOCUMENTATION OR OPTION_BUILD_PDF_DOCUMENTATION)
-    add_subdirectory(documentation)
-endif(OPTION_BUILD_HTML_DOCUMENTATION OR OPTION_BUILD_PDF_DOCUMENTATION)
+if (OPTION_BUILD_HTML_DOCUMENTATION OR OPTION_BUILD_PDF_DOCUMENTATION)
+  add_subdirectory (documentation)
+endif (OPTION_BUILD_HTML_DOCUMENTATION OR OPTION_BUILD_PDF_DOCUMENTATION)
 
 #######################################################################
-include(FindPkgConfig)
+include (FindPkgConfig)
 
-option(OPTION_CAIRO "use lib Cairo" OFF)
-option(OPTION_CAIROEXT
-   "use FLTK code instrumentation for Cairo extended use" OFF
-   )
+option (OPTION_CAIRO "use lib Cairo" OFF)
+option (OPTION_CAIROEXT
+  "use FLTK code instrumentation for Cairo extended use" OFF
+)
 
 if ((OPTION_CAIRO OR OPTION_CAIROEXT) AND LIB_CAIRO)
-   pkg_search_module(PKG_CAIRO cairo)
+  pkg_search_module (PKG_CAIRO cairo)
 endif ((OPTION_CAIRO OR OPTION_CAIROEXT) AND LIB_CAIRO)
 
 if (PKG_CAIRO_FOUND)
-   set (FLTK_HAVE_CAIRO 1)
-   add_subdirectory(cairo)
-   list(APPEND FLTK_LDLIBS -lcairo -lpixman-1)
-   include_directories(${PKG_CAIRO_INCLUDE_DIRS})
-   string(REPLACE ";" " " CAIROFLAGS "${PKG_CAIRO_CFLAGS}")
-
-   if (LIB_CAIRO AND OPTION_CAIROEXT)
-     set(FLTK_USE_CAIRO 1)
-     set(FLTK_CAIRO_FOUND TRUE)
-   else ()
-     set(FLTK_CAIRO_FOUND FALSE)
-   endif (LIB_CAIRO AND OPTION_CAIROEXT)
+  set (FLTK_HAVE_CAIRO 1)
+  add_subdirectory (cairo)
+  list (APPEND FLTK_LDLIBS -lcairo -lpixman-1)
+  include_directories (${PKG_CAIRO_INCLUDE_DIRS})
+  string (REPLACE ";" " " CAIROFLAGS "${PKG_CAIRO_CFLAGS}")
+
+  if (LIB_CAIRO AND OPTION_CAIROEXT)
+    set (FLTK_USE_CAIRO 1)
+    set (FLTK_CAIRO_FOUND TRUE)
+  else ()
+    set (FLTK_CAIRO_FOUND FALSE)
+  endif (LIB_CAIRO AND OPTION_CAIROEXT)
 else ()
-   if (OPTION_CAIRO OR OPTION_CAIROEXT)
-     message(STATUS "*** Cairo was requested but not found - please check your cairo installation")
-     message(STATUS "***   or disable options OPTION_CAIRO and OPTION_CAIRO_EXT.")
-     message(FATAL_ERROR "*** Terminating: missing Cairo libs or headers.")
-   endif (OPTION_CAIRO OR OPTION_CAIROEXT)
+  if (OPTION_CAIRO OR OPTION_CAIROEXT)
+    message (STATUS "*** Cairo was requested but not found - please check your cairo installation")
+    message (STATUS "***   or disable options OPTION_CAIRO and OPTION_CAIRO_EXT.")
+    message (FATAL_ERROR "*** Terminating: missing Cairo libs or headers.")
+  endif (OPTION_CAIRO OR OPTION_CAIROEXT)
 endif (PKG_CAIRO_FOUND)
 
 #######################################################################
-option(OPTION_USE_SVG "read/write SVG files" ON)
+option (OPTION_USE_SVG "read/write SVG files" ON)
 
-if(OPTION_USE_SVG)
-  set(FLTK_USE_SVG 1)
-endif(OPTION_USE_SVG)
+if (OPTION_USE_SVG)
+  set (FLTK_USE_SVG 1)
+endif (OPTION_USE_SVG)
 
 #######################################################################
-set(HAVE_GL LIB_GL OR LIB_MesaGL)
+set (HAVE_GL LIB_GL OR LIB_MesaGL)
 
-if(HAVE_GL)
-   option(OPTION_USE_GL "use OpenGL" ON)
-endif(HAVE_GL)
+if (HAVE_GL)
+   option (OPTION_USE_GL "use OpenGL" ON)
+endif (HAVE_GL)
 
-if(OPTION_USE_GL)
-   if(OPTION_APPLE_X11)
-      set(OPENGL_FOUND TRUE)
-      set(OPENGL_LIBRARIES -L${PATH_TO_XLIBS} -lGLU -lGL)
-      set(HAVE_GL_GLU_H /opt/X11/include/GL/glu.h)
-   elseif(OPTION_APPLE_SDL)
-      set(OPENGL_FOUND FALSE)
-   else()
-      include(FindOpenGL)
-      if(APPLE)
-         set(HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
-      endif(APPLE)
-   endif(OPTION_APPLE_X11)
+if (OPTION_USE_GL)
+  if (OPTION_APPLE_X11)
+    set (OPENGL_FOUND TRUE)
+    set (OPENGL_LIBRARIES -L${PATH_TO_XLIBS} -lGLU -lGL)
+    find_file (HAVE_GL_GLU_H GL/glu.h PATHS /opt/X11/include)
+  elseif (OPTION_APPLE_SDL)
+    set (OPENGL_FOUND FALSE)
+  else()
+    include (FindOpenGL)
+    if (APPLE)
+      set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
+    endif (APPLE)
+  endif (OPTION_APPLE_X11)
 else ()
-  set(OPENGL_FOUND FALSE)
-endif(OPTION_USE_GL)
+  set (OPENGL_FOUND FALSE)
+endif (OPTION_USE_GL)
 
 if (OPENGL_FOUND)
   set (CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
@@ -256,44 +240,44 @@ endif (OPTION_LARGE_FILE)
 # before this file is included (or set to 0 for WIN32).
 
 if (WIN32 AND NOT CYGWIN)
-  # set(HAVE_PTHREAD_H 0) # (see resources.cmake)
-  set(OPTION_USE_THREADS FALSE)
+  # set (HAVE_PTHREAD_H 0) # (see resources.cmake)
+  set (OPTION_USE_THREADS FALSE)
 else ()
-  option(OPTION_USE_THREADS "use multi-threading with pthreads" ON)
+  option (OPTION_USE_THREADS "use multi-threading with pthreads" ON)
 endif (WIN32 AND NOT CYGWIN)
 
 # initialize more variables
-set(USE_THREADS 0)
-set(HAVE_PTHREAD 0)
-set(FLTK_PTHREADS_FOUND FALSE)
+set (USE_THREADS 0)
+set (HAVE_PTHREAD 0)
+set (FLTK_PTHREADS_FOUND FALSE)
 
 if (OPTION_USE_THREADS)
 
-  include(FindThreads)
+  include (FindThreads)
 
   if (CMAKE_HAVE_THREADS_LIBRARY)
-    add_definitions("-D_THREAD_SAFE -D_REENTRANT")
-    set(USE_THREADS 1)
-    set(FLTK_THREADS_FOUND TRUE)
+    add_definitions ("-D_THREAD_SAFE -D_REENTRANT")
+    set (USE_THREADS 1)
+    set (FLTK_THREADS_FOUND TRUE)
   endif (CMAKE_HAVE_THREADS_LIBRARY)
 
   if (CMAKE_USE_PTHREADS_INIT AND NOT WIN32)
-    set(HAVE_PTHREAD 1)
+    set (HAVE_PTHREAD 1)
     if (NOT APPLE)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
+      set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
     endif (NOT APPLE)
-    list(APPEND FLTK_LDLIBS -lpthread)
-    list(APPEND FLTK_CFLAGS -D_THREAD_SAFE -D_REENTRANT)
-    set(FLTK_PTHREADS_FOUND TRUE)
+    list (APPEND FLTK_LDLIBS -lpthread)
+    list (APPEND FLTK_CFLAGS -D_THREAD_SAFE -D_REENTRANT)
+    set (FLTK_PTHREADS_FOUND TRUE)
   else()
-    set(HAVE_PTHREAD 0)
-    set(HAVE_PTHREAD_H 0)
-    set(FLTK_PTHREADS_FOUND FALSE)
-  endif(CMAKE_USE_PTHREADS_INIT AND NOT WIN32)
+    set (HAVE_PTHREAD 0)
+    set (HAVE_PTHREAD_H 0)
+    set (FLTK_PTHREADS_FOUND FALSE)
+  endif (CMAKE_USE_PTHREADS_INIT AND NOT WIN32)
 
 else (OPTION_USE_THREADS)
 
-  set(HAVE_PTHREAD_H 0)
+  set (HAVE_PTHREAD_H 0)
 
 endif (OPTION_USE_THREADS)
 
@@ -323,7 +307,7 @@ if (ZLIB_FOUND)
   set (FLTK_BUILTIN_ZLIB_FOUND FALSE)
 else()
   if (OPTION_USE_SYSTEM_ZLIB)
-    message(STATUS "\ncannot find system zlib library - using built-in\n")
+    message (STATUS "\ncannot find system zlib library - using built-in\n")
   endif (OPTION_USE_SYSTEM_ZLIB)
 
   add_subdirectory (zlib)
@@ -347,9 +331,9 @@ if (OPTION_USE_SYSTEM_LIBJPEG)
 endif (OPTION_USE_SYSTEM_LIBJPEG)
 
 if (JPEG_FOUND)
-  set(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
-  include_directories(${JPEG_INCLUDE_DIR})
-  set(FLTK_BUILTIN_JPEG_FOUND FALSE)
+  set (FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
+  include_directories (${JPEG_INCLUDE_DIR})
+  set (FLTK_BUILTIN_JPEG_FOUND FALSE)
 else ()
   if (OPTION_USE_SYSTEM_LIBJPEG)
     message (STATUS "\ncannot find system jpeg library - using built-in\n")
@@ -396,101 +380,101 @@ endif (PNG_FOUND)
 set (HAVE_LIBPNG 1)
 
 #######################################################################
-if(X11_Xinerama_FOUND)
-   option(OPTION_USE_XINERAMA "use lib Xinerama" ON)
-endif(X11_Xinerama_FOUND)
+if (X11_Xinerama_FOUND)
+  option (OPTION_USE_XINERAMA "use lib Xinerama" ON)
+endif (X11_Xinerama_FOUND)
 
-if(OPTION_USE_XINERAMA)
-   set(HAVE_XINERAMA ${X11_Xinerama_FOUND})
-   include_directories(${X11_Xinerama_INCLUDE_PATH})
-   list(APPEND FLTK_LDLIBS -lXinerama)
-   set(FLTK_XINERAMA_FOUND TRUE)
+if (OPTION_USE_XINERAMA)
+  set (HAVE_XINERAMA ${X11_Xinerama_FOUND})
+  include_directories (${X11_Xinerama_INCLUDE_PATH})
+  list (APPEND FLTK_LDLIBS -lXinerama)
+  set (FLTK_XINERAMA_FOUND TRUE)
 else()
-   set(FLTK_XINERAMA_FOUND FALSE)
-endif(OPTION_USE_XINERAMA)
+  set (FLTK_XINERAMA_FOUND FALSE)
+endif (OPTION_USE_XINERAMA)
 
 #######################################################################
-if(X11_Xfixes_FOUND)
-   option(OPTION_USE_XFIXES "use lib Xfixes" ON)
-endif(X11_Xfixes_FOUND)
+if (X11_Xfixes_FOUND)
+  option (OPTION_USE_XFIXES "use lib Xfixes" ON)
+endif (X11_Xfixes_FOUND)
 
-if(OPTION_USE_XFIXES)
-   set(HAVE_XFIXES ${X11_Xfixes_FOUND})
-   include_directories(${X11_Xfixes_INCLUDE_PATH})
-   list(APPEND FLTK_LDLIBS -lXfixes)
-   set(FLTK_XFIXES_FOUND TRUE)
+if (OPTION_USE_XFIXES)
+  set (HAVE_XFIXES ${X11_Xfixes_FOUND})
+  include_directories (${X11_Xfixes_INCLUDE_PATH})
+  list (APPEND FLTK_LDLIBS -lXfixes)
+  set (FLTK_XFIXES_FOUND TRUE)
 else()
-   set(FLTK_XFIXES_FOUND FALSE)
-endif(OPTION_USE_XFIXES)
+  set (FLTK_XFIXES_FOUND FALSE)
+endif (OPTION_USE_XFIXES)
 
 #######################################################################
-if(X11_Xcursor_FOUND)
-   option(OPTION_USE_XCURSOR "use lib Xcursor" ON)
-endif(X11_Xcursor_FOUND)
+if (X11_Xcursor_FOUND)
+  option (OPTION_USE_XCURSOR "use lib Xcursor" ON)
+endif (X11_Xcursor_FOUND)
 
-if(OPTION_USE_XCURSOR)
-   set(HAVE_XCURSOR ${X11_Xcursor_FOUND})
-   include_directories(${X11_Xcursor_INCLUDE_PATH})
-   list(APPEND FLTK_LDLIBS -lXcursor)
-   set(FLTK_XCURSOR_FOUND TRUE)
+if (OPTION_USE_XCURSOR)
+  set (HAVE_XCURSOR ${X11_Xcursor_FOUND})
+  include_directories (${X11_Xcursor_INCLUDE_PATH})
+  list (APPEND FLTK_LDLIBS -lXcursor)
+  set (FLTK_XCURSOR_FOUND TRUE)
 else()
-   set(FLTK_XCURSOR_FOUND FALSE)
-endif(OPTION_USE_XCURSOR)
+  set (FLTK_XCURSOR_FOUND FALSE)
+endif (OPTION_USE_XCURSOR)
 
 #######################################################################
-if(X11_Xft_FOUND)
-   option(OPTION_USE_XFT "use lib Xft" ON)
-   option(OPTION_USE_PANGO "use lib Pango" OFF)
-endif(X11_Xft_FOUND)
+if (X11_Xft_FOUND)
+  option (OPTION_USE_XFT "use lib Xft" ON)
+  option (OPTION_USE_PANGO "use lib Pango" OFF)
+endif (X11_Xft_FOUND)
 
 # test option compatibility: Pango requires Xft
 if (OPTION_USE_PANGO)
   if (NOT X11_Xft_FOUND)
-    message(STATUS "Pango requires Xft but Xft library or headers could not be found.")
-    message(STATUS "Please install Xft development files and try again or disable OPTION_USE_PANGO.")
-    message(FATAL_ERROR "*** Aborting ***")
+    message (STATUS "Pango requires Xft but Xft library or headers could not be found.")
+    message (STATUS "Please install Xft development files and try again or disable OPTION_USE_PANGO.")
+    message (FATAL_ERROR "*** Aborting ***")
   else ()
     if (NOT OPTION_USE_XFT)
-      message(STATUS "Pango requires Xft but usage of Xft was disabled.")
-      message(STATUS "Please enable OPTION_USE_XFT and try again or disable OPTION_USE_PANGO.")
-      message(FATAL_ERROR "*** Aborting ***")
+      message (STATUS "Pango requires Xft but usage of Xft was disabled.")
+      message (STATUS "Please enable OPTION_USE_XFT and try again or disable OPTION_USE_PANGO.")
+      message (FATAL_ERROR "*** Aborting ***")
     endif (NOT OPTION_USE_XFT)
   endif (NOT X11_Xft_FOUND)
 endif (OPTION_USE_PANGO)
 
 #######################################################################
-if(X11_Xft_FOUND AND OPTION_USE_PANGO)
+if (X11_Xft_FOUND AND OPTION_USE_PANGO)
   pkg_check_modules(PANGOXFT pangoxft)
-  # message(STATUS "PANGOXFT_FOUND=" ${PANGOXFT_FOUND})
-  if(PANGOXFT_FOUND)
-    include_directories(${PANGOXFT_INCLUDE_DIRS})
+  # message (STATUS "PANGOXFT_FOUND=" ${PANGOXFT_FOUND})
+  if (PANGOXFT_FOUND)
+    include_directories (${PANGOXFT_INCLUDE_DIRS})
     find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH})
     find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH})
-    set(USE_PANGO TRUE)
-    list(APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
+    set (USE_PANGO TRUE)
+    list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
   else(PANGOXFT_FOUND)
 
-#this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
-  if(APPLE AND OPTION_APPLE_X11)
-     find_file(FINK_PREFIX NAMES /opt/sw /sw)
-     list(APPEND CMAKE_INCLUDE_PATH  ${FINK_PREFIX}/include)
-     list(APPEND CMAKE_LIBRARY_PATH  ${FINK_PREFIX}/lib)
-  endif(APPLE AND OPTION_APPLE_X11)
+  # this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
+  if (APPLE AND OPTION_APPLE_X11)
+    find_file(FINK_PREFIX NAMES /opt/sw /sw)
+    list (APPEND CMAKE_INCLUDE_PATH  ${FINK_PREFIX}/include)
+    list (APPEND CMAKE_LIBRARY_PATH  ${FINK_PREFIX}/lib)
+  endif (APPLE AND OPTION_APPLE_X11)
   find_file(HAVE_PANGO_H pango-1.0/pango/pango.h ${CMAKE_INCLUDE_PATH})
   find_file(HAVE_PANGOXFT_H pango-1.0/pango/pangoxft.h ${CMAKE_INCLUDE_PATH})
 
-  if(HAVE_PANGO_H AND HAVE_PANGOXFT_H)
+  if (HAVE_PANGO_H AND HAVE_PANGOXFT_H)
     find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH})
     find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH})
-    if(APPLE)
-      set(HAVE_LIB_GOBJECT TRUE)
+    if (APPLE)
+      set (HAVE_LIB_GOBJECT TRUE)
     else()
       find_library(HAVE_LIB_GOBJECT gobject-2.0 ${CMAKE_LIBRARY_PATH})
-    endif(APPLE)
-  endif(HAVE_PANGO_H AND HAVE_PANGOXFT_H)
-  if(HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
-    set(USE_PANGO TRUE)
-    # message(STATUS "USE_PANGO=" ${USE_PANGO})
+    endif (APPLE)
+  endif (HAVE_PANGO_H AND HAVE_PANGOXFT_H)
+  if (HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
+    set (USE_PANGO TRUE)
+    # message (STATUS "USE_PANGO=" ${USE_PANGO})
     # remove last 3 components of HAVE_PANGO_H and put in PANGO_H_PREFIX
     get_filename_component(PANGO_H_PREFIX ${HAVE_PANGO_H} PATH)
     get_filename_component(PANGO_H_PREFIX ${PANGO_H_PREFIX} PATH)
@@ -499,84 +483,80 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
     get_filename_component(PANGOLIB_DIR ${HAVE_LIB_PANGO} PATH)
     # glib.h is usually in ${PANGO_H_PREFIX}/glib-2.0/ ...
     find_path(GLIB_H_PATH glib.h ${PANGO_H_PREFIX}/glib-2.0)
-    if(NOT GLIB_H_PATH) # ... but not under NetBSD
+    if (NOT GLIB_H_PATH) # ... but not under NetBSD
       find_path(GLIB_H_PATH glib.h ${PANGO_H_PREFIX}/glib/glib-2.0)
-    endif(NOT GLIB_H_PATH)
-    include_directories(${PANGO_H_PREFIX}/pango-1.0 ${GLIB_H_PATH} ${PANGOLIB_DIR}/glib-2.0/include)
-    list(APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
+    endif (NOT GLIB_H_PATH)
+    include_directories (${PANGO_H_PREFIX}/pango-1.0 ${GLIB_H_PATH} ${PANGOLIB_DIR}/glib-2.0/include)
+    list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
     if (APPLE)
-      set(LDFLAGS "${LDFLAGS} -L${FINK_PREFIX}/lib")
+      set (LDFLAGS "${LDFLAGS} -L${FINK_PREFIX}/lib")
     endif (APPLE)
-  endif(HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
-endif(PANGOXFT_FOUND)
-endif(X11_Xft_FOUND AND OPTION_USE_PANGO)
-
-if(OPTION_USE_XFT)
-   set(USE_XFT X11_Xft_FOUND)
-   list(APPEND FLTK_LDLIBS -lXft)
-   set(FLTK_XFT_FOUND TRUE)
-   if(APPLE AND OPTION_APPLE_X11)
-     find_library(LIB_fontconfig fontconfig "/opt/X11/lib")
-   endif(APPLE AND OPTION_APPLE_X11)
+  endif (HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
+endif (PANGOXFT_FOUND)
+endif (X11_Xft_FOUND AND OPTION_USE_PANGO)
+
+if (OPTION_USE_XFT)
+  set (USE_XFT X11_Xft_FOUND)
+  list (APPEND FLTK_LDLIBS -lXft)
+  set (FLTK_XFT_FOUND TRUE)
+  if (APPLE AND OPTION_APPLE_X11)
+    find_library(LIB_fontconfig fontconfig "/opt/X11/lib")
+  endif (APPLE AND OPTION_APPLE_X11)
 else()
-   set(FLTK_XFT_FOUND FALSE)
-endif(OPTION_USE_XFT)
-
-#######################################################################
-if(X11_Xrender_FOUND)
-   option(OPTION_USE_XRENDER "use lib Xrender" ON)
-endif(X11_Xrender_FOUND)
-
-if(OPTION_USE_XRENDER)
-   set(HAVE_XRENDER ${X11_Xrender_FOUND})
-   if(HAVE_XRENDER)
-      include_directories(${X11_Xrender_INCLUDE_PATH})
-      list(APPEND FLTK_LDLIBS -lXrender)
-      set(FLTK_XRENDER_FOUND TRUE)
-   else(HAVE_XRENDER)
-      set(FLTK_XRENDER_FOUND FALSE)
-   endif(HAVE_XRENDER)
+  set (FLTK_XFT_FOUND FALSE)
+endif (OPTION_USE_XFT)
+
+#######################################################################
+if (X11_Xrender_FOUND)
+  option (OPTION_USE_XRENDER "use lib Xrender" ON)
+endif (X11_Xrender_FOUND)
+
+if (OPTION_USE_XRENDER)
+  set (HAVE_XRENDER ${X11_Xrender_FOUND})
+  if (HAVE_XRENDER)
+    include_directories (${X11_Xrender_INCLUDE_PATH})
+    list (APPEND FLTK_LDLIBS -lXrender)
+    set (FLTK_XRENDER_FOUND TRUE)
+  else(HAVE_XRENDER)
+    set (FLTK_XRENDER_FOUND FALSE)
+  endif (HAVE_XRENDER)
 else(OPTION_USE_XRENDER)
-   set(FLTK_XRENDER_FOUND FALSE)
-endif(OPTION_USE_XRENDER)
+  set (FLTK_XRENDER_FOUND FALSE)
+endif (OPTION_USE_XRENDER)
 
 #######################################################################
-if(X11_FOUND)
-   option(OPTION_USE_XDBE "use lib Xdbe" ON)
-endif(X11_FOUND)
+if (X11_FOUND)
+  option (OPTION_USE_XDBE "use lib Xdbe" ON)
+endif (X11_FOUND)
 
-if(OPTION_USE_XDBE AND HAVE_XDBE_H)
-   set(HAVE_XDBE 1)
-   set(FLTK_XDBE_FOUND TRUE)
+if (OPTION_USE_XDBE AND HAVE_XDBE_H)
+  set (HAVE_XDBE 1)
+  set (FLTK_XDBE_FOUND TRUE)
 else()
-   set(FLTK_XDBE_FOUND FALSE)
-endif(OPTION_USE_XDBE AND HAVE_XDBE_H)
+  set (FLTK_XDBE_FOUND FALSE)
+endif (OPTION_USE_XDBE AND HAVE_XDBE_H)
 
 #######################################################################
-set(FL_NO_PRINT_SUPPORT FALSE)
-if(X11_FOUND AND NOT OPTION_PRINT_SUPPORT)
-   set(FL_NO_PRINT_SUPPORT TRUE)
-endif(X11_FOUND AND NOT OPTION_PRINT_SUPPORT)
+set (FL_NO_PRINT_SUPPORT FALSE)
+if (X11_FOUND AND NOT OPTION_PRINT_SUPPORT)
+  set (FL_NO_PRINT_SUPPORT TRUE)
+endif (X11_FOUND AND NOT OPTION_PRINT_SUPPORT)
 #######################################################################
 
 #######################################################################
-set(FL_CFG_NO_FILESYSTEM_SUPPORT TRUE)
-if(OPTION_FILESYSTEM_SUPPORT)
-   set(FL_CFG_NO_FILESYSTEM_SUPPORT FALSE)
-endif(OPTION_FILESYSTEM_SUPPORT)
+set (FL_CFG_NO_FILESYSTEM_SUPPORT TRUE)
+if (OPTION_FILESYSTEM_SUPPORT)
+  set (FL_CFG_NO_FILESYSTEM_SUPPORT FALSE)
+endif (OPTION_FILESYSTEM_SUPPORT)
 #######################################################################
 
 #######################################################################
-option (OPTION_CREATE_ANDROID_STUDIO_IDE "create files needed to compile FLtk for Android" OFF)
+option (OPTION_CREATE_ANDROID_STUDIO_IDE "create files needed to compile FLTK for Android" OFF)
 #######################################################################
 
 #######################################################################
-# prior to CMake 3.0 this feature was buggy
-if(NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-    option(CMAKE_SUPPRESS_REGENERATION
-      "suppress rules to re-run CMake on rebuild" OFF)
-    mark_as_advanced(CMAKE_SUPPRESS_REGENERATION)
-endif(NOT CMAKE_VERSION VERSION_LESS 3.0.0)
+option (CMAKE_SUPPRESS_REGENERATION "suppress rules to re-run CMake on rebuild" OFF)
+mark_as_advanced (CMAKE_SUPPRESS_REGENERATION)
 
 #######################################################################
 # Debugging ...
@@ -587,7 +567,6 @@ if (DEBUG_OPTIONS_CMAKE)
   fl_debug_var (LIBS)
   fl_debug_var (GLLIBS)
   fl_debug_var (FLTK_LDLIBS)
-  fl_debug_var (USE_FIND_FILE)
   fl_debug_var (OPENGL_FOUND)
   fl_debug_var (OPENGL_INCLUDE_DIR)
   fl_debug_var (OPENGL_LIBRARIES)