From 1de5fbfbbf90ba205f2599c7472c37dd19b38ebc Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bmiklautz@thinstuff.com>
Date: Tue, 17 Jan 2012 18:22:10 +0100
Subject: [PATCH] Changed include path for X11 and extensions.

X11 and X11/extensions should not be part of X11 include path
if X11/xxx.h or X11/extensions/xxx.h is used in source files.
---
 cmake/FindX11.cmake      | 2 +-
 cmake/FindXKBFile.cmake  | 2 +-
 cmake/FindXShm.cmake     | 2 +-
 cmake/FindXTest.cmake    | 2 +-
 cmake/FindXcursor.cmake  | 2 +-
 cmake/FindXdamage.cmake  | 2 +-
 cmake/FindXext.cmake     | 2 +-
 cmake/FindXfixes.cmake   | 2 +-
 cmake/FindXinerama.cmake | 2 +-
 cmake/FindXv.cmake       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmake/FindX11.cmake b/cmake/FindX11.cmake
index 91f153339..594b2c022 100644
--- a/cmake/FindX11.cmake
+++ b/cmake/FindX11.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(X11_INCLUDE_DIR NAMES Xlib.h
+find_path(X11_INCLUDE_DIR NAMES X11/Xlib.h
           PATH_SUFFIXES X11
           DOC "The X11 include directory"
 )
diff --git a/cmake/FindXKBFile.cmake b/cmake/FindXKBFile.cmake
index db76ed6e4..4c0a33374 100644
--- a/cmake/FindXKBFile.cmake
+++ b/cmake/FindXKBFile.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XKBFILE_INCLUDE_DIR NAMES XKBfile.h
+find_path(XKBFILE_INCLUDE_DIR NAMES X11/extensions/XKBfile.h
           PATH_SUFFIXES X11/extensions
           DOC "The XKBFile include directory"
 )
diff --git a/cmake/FindXShm.cmake b/cmake/FindXShm.cmake
index 4ac509168..8213f25e8 100644
--- a/cmake/FindXShm.cmake
+++ b/cmake/FindXShm.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XSHM_INCLUDE_DIR NAMES XShm.h
+find_path(XSHM_INCLUDE_DIR NAMES X11/extensions/XShm.h
           PATH_SUFFIXES X11/extensions
           DOC "The XShm include directory"
 )
diff --git a/cmake/FindXTest.cmake b/cmake/FindXTest.cmake
index ea00dcff8..85fe7b8c8 100644
--- a/cmake/FindXTest.cmake
+++ b/cmake/FindXTest.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XTEST_INCLUDE_DIR NAMES XTest.h
+find_path(XTEST_INCLUDE_DIR NAMES X11/extensions/XTest.h
           PATH_SUFFIXES X11/extensions
           DOC "The XTest include directory"
 )
diff --git a/cmake/FindXcursor.cmake b/cmake/FindXcursor.cmake
index 6217d597e..4eead70bb 100644
--- a/cmake/FindXcursor.cmake
+++ b/cmake/FindXcursor.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XCURSOR_INCLUDE_DIR NAMES Xcursor.h
+find_path(XCURSOR_INCLUDE_DIR NAMES X11/Xcursor/Xcursor.h
           PATH_SUFFIXES X11/Xcursor
           DOC "The Xcursor include directory"
 )
diff --git a/cmake/FindXdamage.cmake b/cmake/FindXdamage.cmake
index 79ea6df9a..61d41587f 100644
--- a/cmake/FindXdamage.cmake
+++ b/cmake/FindXdamage.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XDAMAGE_INCLUDE_DIR NAMES Xdamage.h
+find_path(XDAMAGE_INCLUDE_DIR NAMES X11/extensions/Xdamage.h
           PATH_SUFFIXES X11/extensions
           DOC "The Xdamage include directory"
 )
diff --git a/cmake/FindXext.cmake b/cmake/FindXext.cmake
index 8fd8372c6..8429ec645 100644
--- a/cmake/FindXext.cmake
+++ b/cmake/FindXext.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XEXT_INCLUDE_DIR NAMES Xext.h
+find_path(XEXT_INCLUDE_DIR NAMES X11/extensions/Xext.h
           PATH_SUFFIXES X11/extensions
           DOC "The Xext include directory"
 )
diff --git a/cmake/FindXfixes.cmake b/cmake/FindXfixes.cmake
index f826cf056..c3875766e 100644
--- a/cmake/FindXfixes.cmake
+++ b/cmake/FindXfixes.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XFIXES_INCLUDE_DIR NAMES Xfixes.h
+find_path(XFIXES_INCLUDE_DIR NAMES X11/extensions/Xfixes.h
           PATH_SUFFIXES X11/extensions
           DOC "The Xfixes include directory"
 )
diff --git a/cmake/FindXinerama.cmake b/cmake/FindXinerama.cmake
index c39fb96b4..3f786133b 100644
--- a/cmake/FindXinerama.cmake
+++ b/cmake/FindXinerama.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XINERAMA_INCLUDE_DIR NAMES Xinerama.h
+find_path(XINERAMA_INCLUDE_DIR NAMES X11/extensions/Xinerama.h
           PATH_SUFFIXES X11/extensions
           DOC "The Xinerama include directory"
 )
diff --git a/cmake/FindXv.cmake b/cmake/FindXv.cmake
index 0a4c4e294..e8887d730 100644
--- a/cmake/FindXv.cmake
+++ b/cmake/FindXv.cmake
@@ -28,7 +28,7 @@
 # limitations under the License.
 #=============================================================================
 
-find_path(XV_INCLUDE_DIR NAMES Xv.h
+find_path(XV_INCLUDE_DIR NAMES X11/extensions/Xv.h
           PATH_SUFFIXES X11/extensions
           DOC "The Xv include directory"
 )