diff options
| author | Dirk Mueller <mueller@kde.org> | 2007-02-28 20:35:57 +0000 |
|---|---|---|
| committer | Dirk Mueller <mueller@kde.org> | 2007-02-28 20:35:57 +0000 |
| commit | c1d5726abd8600b19e76537f9ee835840f44f319 (patch) | |
| tree | 9f95e63da2f3677d77e5c2624718ea6e88a063b0 | |
| parent | 3bc95c642db6c2fdb50d3d10cc3252007409d7a6 (diff) | |
| download | extra-cmake-modules-c1d5726abd8600b19e76537f9ee835840f44f319.tar.gz extra-cmake-modules-c1d5726abd8600b19e76537f9ee835840f44f319.tar.bz2 | |
fix X11 detection again. Whats the point of not searching
X11 in /usr/include, when it is actually installed there
for almost all newer distros?
svn path=/trunk/KDE/kdelibs/; revision=638102
| -rw-r--r-- | modules/FindX11.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 4216031c..8eeabfe4 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -24,16 +24,20 @@ if (UNIX) set(X11_FOUND 0) set(X11_INC_SEARCH_PATH - /usr/X11R6/include + /usr/local/include + /usr/include + /usr/X11R6/include /usr/include/X11 - /usr/openwin/include - /usr/openwin/share/include + /usr/openwin/include + /usr/openwin/share/include /opt/graphics/OpenGL/include ) set(X11_LIB_SEARCH_PATH + /usr/local/lib + /usr/lib /usr/X11R6/lib - /usr/openwin/lib + /usr/openwin/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) |