From 5295385c34d76705612f6d0e1396884a23284ad7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 16 Aug 2008 07:38:12 -0400 Subject: ENH: also search in /usr/X11R7, remove /usr/lib and /usr/local/lib, they are part of the standard search paths (partly sync wih KDE) Alex --- Modules/FindX11.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 0db6abe..3155aac 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -46,20 +46,18 @@ IF (UNIX) SET(X11_INC_SEARCH_PATH /usr/pkg/xorg/include /usr/X11R6/include - /usr/local/include + /usr/X11R7/include /usr/include/X11 /usr/openwin/include /usr/openwin/share/include /opt/graphics/OpenGL/include - /usr/include ) SET(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib /usr/X11R6/lib - /usr/local/lib + /usr/X11R7/lib /usr/openwin/lib - /usr/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) -- cgit v0.12