[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-02-28 20:35:57
Message-ID: 1172694957.906643.12047.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638102 by mueller:

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?


 M  +8 -4      FindX11.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindX11.cmake #638101:638102
@@ -24,16 +24,20 @@
   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})
[prev in list] [next in list] [prev in thread] [next in thread]