Revision: 45789
http://brlcad.svn.sourceforge.net/brlcad/?rev=45789&view=rev
Author: starseeker
Date: 2011-08-05 02:06:33 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
FindX11 changes from tk - really need to put together some svn foo to have all
these multiple copies of files come from one source file.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindX11.cmake
Modified: brlcad/trunk/misc/CMake/FindX11.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindX11.cmake 2011-08-05 02:05:09 UTC (rev
45788)
+++ brlcad/trunk/misc/CMake/FindX11.cmake 2011-08-05 02:06:33 UTC (rev
45789)
@@ -57,6 +57,7 @@
SET(CMAKE_FIND_FRAMEWORK NEVER)
SET(X11_INC_SEARCH_PATH
/usr/pkg/xorg/include
+ /usr/X11/include
/usr/X11R6/include
/usr/X11R7/include
/usr/include/X11
@@ -65,6 +66,7 @@
/usr/openwin/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
+ /usr/include
)
SET(X11_LIB_SEARCH_PATH
@@ -81,67 +83,67 @@
/usr/openwin/lib
)
- FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h
${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
# Look for includes; keep the list sorted by name of the cmake *_INCLUDE_PATH
# variable (which doesn't need to match the include file name).
# Solaris lacks XKBrules.h, so we should skip kxkbd there.
- FIND_PATH(X11_ICE_INCLUDE_PATH X11/ICE/ICE.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xi_INCLUDE_PATH X11/extensions/XInput.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h
${X11_INC_SEARCH_PATH})
- FIND_PATH(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h
${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_ICE_INCLUDE_PATH X11/ICE/ICE.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xi_INCLUDE_PATH X11/extensions/XInput.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
+ FIND_PATH(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h
${X11_INC_SEARCH_PATH} NO_DEFAULT_PATH)
- FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH})
+ FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
# Find additional X libraries. Keep list sorted by library name.
- FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_SM_LIB SM ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xi_LIB Xi ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH})
- FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH})
+ FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_SM_LIB SM ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xi_LIB Xi ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
+ FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}
NO_DEFAULT_PATH)
SET(X11_LIBRARY_DIR "")
IF(X11_X11_LIB)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
