Revision: 4838
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4838&view=rev
Author: ossman_
Date: 2012-01-23 15:43:42 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Failure to find FLTK dependencies is only fatal for our version of FLTK.
When using the system version we have to assume it's built the way the
user wants.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-01-18 08:10:21 UTC (rev 4837)
+++ trunk/CMakeLists.txt 2012-01-23 15:43:42 UTC (rev 4838)
@@ -247,23 +247,15 @@
# 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()
@@ -298,6 +290,22 @@
set(USE_INCLUDED_FLTK 1)
endif()
if(USE_INCLUDED_FLTK)
+ # Check that we have the proper dependencies
+ if(UNIX AND NOT APPLE)
+ if(NOT X11_Xft_FOUND)
+ message(FATAL_ERROR "Xft headers/libraries not found (needed by FLTK.)")
+ endif()
+ if(NOT X11_Xinerama_FOUND)
+ message(FATAL_ERROR "Xinerama headers/libraries not found (needed by
FLTK.)")
+ endif()
+ if(NOT X11_Xfixes_FOUND)
+ message(FATAL_ERROR "Xfixes headers/libraries not found (needed by
FLTK.)")
+ endif()
+ if(NOT X11_Xcursor_FOUND)
+ message(FATAL_ERROR "Xcursor headers/libraries not found (needed by
FLTK.)")
+ endif()
+ endif()
+
set(HAVE_FLTK_DEAD_KEYS 1)
set(HAVE_FLTK_CLIPBOARD 1)
set(HAVE_FLTK_MEDIAKEYS 1)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
