diff options
| author | DRC <dcommander@users.sourceforge.net> | 2012-01-17 22:33:45 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2012-01-17 22:33:45 +0000 |
| commit | 0141bd5e6937579d44e4391265154bd696ea5172 (patch) | |
| tree | f186650102e950251e9023c51386dcb8cd54859d /CMakeLists.txt | |
| parent | 13884f79a35a35fb2140b9e7fd25508e0bd82c7f (diff) | |
| download | tigervnc-0141bd5e6937579d44e4391265154bd696ea5172.tar.gz tigervnc-0141bd5e6937579d44e4391265154bd696ea5172.zip | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e2e2653..4a59d815 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,15 +247,23 @@ if(NOT APPLE) # No proper handling for extra X11 libs that FLTK might need... if(X11_Xft_FOUND) set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xft_LIB}) + else() + message(FATAL_ERROR "Xft headers/libraries not found (needed by FLTK.)") endif() if(X11_Xinerama_FOUND) set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB}) + else() + message(FATAL_ERROR "Xinerama headers/libraries not found (needed by FLTK.)") endif() if(X11_Xfixes_FOUND) set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xfixes_LIB}) + else() + message(FATAL_ERROR "Xfixes headers/libraries not found (needed by FLTK.)") endif() if(X11_Xcursor_FOUND) set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB}) + else() + message(FATAL_ERROR "Xcursor headers/libraries not found (needed by FLTK.)") endif() endif() @@ -304,7 +312,7 @@ if(USE_INCLUDED_FLTK) endif() message(STATUS "Using included FLTK library") endif() - + # Check for GNUTLS library option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON) if(ENABLE_GNUTLS) |