Index: CMake/FLTKConfig.cmake.in =================================================================== --- CMake/FLTKConfig.cmake.in (revision 8864) +++ CMake/FLTKConfig.cmake.in (working copy) @@ -34,6 +34,7 @@ set(FLTK_XINERAMA_FOUND @FLTK_XINERAMA_FOUND@) set(FLTK_XFT_FOUND @FLTK_XFT_FOUND@) set(FLTK_XDBE_FOUND @FLTK_XDBE_FOUND@) +set(FLTK_XRANDR_FOUND @FLTK_XRANDR_FOUND@)
set(FLTK_CAIRO_FOUND @FLTK_CAIRO_FOUND@) set(FLTK_GL_FOUND @FLTK_GL_FOUND@) Index: configh.cmake.in =================================================================== --- configh.cmake.in (revision 8864) +++ configh.cmake.in (working copy) @@ -84,6 +84,14 @@ #cmakedefine01 HAVE_XINERAMA /* + * HAVE_XRANDR + * + * Do we have the Xrandr library to detect changes in multi-head displays? + */ + +#cmakedefine01 HAVE_XRANDR + +/* * USE_XFT * * Use the new Xft library to draw anti-aliased text. Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 8864) +++ CMakeLists.txt (working copy) @@ -119,6 +119,7 @@ find_file(HAVE_SYS_SELECT_H sys/select.h) find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h) find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions) +find_path(HAVE_XRANDR_H Xrandr.h PATH_SUFFIXES X11/extensions extensions) mark_as_advanced(HAVE_ALSA_ASOUNDLIB_H HAVE_DIRENT_H HAVE_DLFCN_H) mark_as_advanced(HAVE_FREETYPE_H HAVE_GL_GL_H HAVE_GL_GLU_H) @@ -126,7 +127,7 @@ mark_as_advanced(HAVE_OPENGL_GLU_H HAVE_PNG_H HAVE_PTHREAD_H) mark_as_advanced(HAVE_STDIO_H HAVE_STRINGS_H HAVE_SYS_DIR_H) mark_as_advanced(HAVE_SYS_NDIR_H HAVE_SYS_SELECT_H) -mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) +mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H HAVE_XRANDR_H) # where to find freetype headers find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) @@ -539,6 +540,19 @@ endif(OPTION_USE_XDBE AND HAVE_XDBE_H) ####################################################################### +if(X11_FOUND) + option(OPTION_USE_XRANDR "use lib Xrandr" ON) +endif(X11_FOUND) + +if(OPTION_USE_XRANDR AND HAVE_XRANDR_H) + set(HAVE_XRANDR 1) + list(APPEND FLTK_LDLIBS -lXrandr) + set(FLTK_XRANDR_FOUND TRUE) +else() + set(FLTK_XRANDR_FOUND FALSE) +endif(OPTION_USE_XRANDR AND HAVE_XRANDR_H) + +####################################################################### # final setup and config ####################################################################### # Set the fluid executable path Index: README.CMake.txt =================================================================== --- README.CMake.txt (revision 8864) +++ README.CMake.txt (working copy) @@ -135,6 +135,7 @@ OPTION_USE_XINERAMA - default ON OPTION_USE_XFT - default ON OPTION_USE_XDBE - default ON +OPTION_USE_XRANDR - default ON BUILDING UNDER LINUX WITH UNIX MAKEFILES _______________________________________________ fltk-dev mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-dev
