Our FLTK patches modified FLTK's autotools-based build system so that HAVE_XFIXES and HAVE_XCURSOR were defined in FLTK's config.h, but those changes never made it into the CMake-based build system used by the in-tree version of FLTK. Further, our build system was allowing silent failures whenever Xft, Xinerama, Xcursor, or Xfixes were not present on the build system. Now, the lack of these libraries is treated as a fatal error, since these libraries are critical for TigerVNC functionality.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4834 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/fltk/CMakeLists.txt b/common/fltk/CMakeLists.txt
index f13eec7..5d1d476 100644
--- a/common/fltk/CMakeLists.txt
+++ b/common/fltk/CMakeLists.txt
@@ -229,6 +229,24 @@
endif(OPTION_USE_XFT)
#######################################################################
+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})
+endif(OPTION_USE_XFIXES)
+
+#######################################################################
+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})
+endif(OPTION_USE_XCURSOR)
+
+#######################################################################
add_subdirectory(src)