-add the include paths of all X11 extensions to X11_INCLUDE_PATH, so they don't have to be added everywhere manually

X11_INCLUDE_PATH is part of KDE4_INCLUDES on UNIX != OS X

CCMAIL: montel@kde.org

Alex



svn path=/trunk/KDE/kdelibs/; revision=524151

1 files changed, 35 insertions, 21 deletions

diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake
index 167019fc..da103933 100644
--- a/modules/FindX11.cmake
+++ b/modules/FindX11.cmake
@@ -83,73 +83,87 @@ if (UNIX)
   endif (X11_Xext_LIB)
 
   if (X11_Xau_LIB)
-	set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB})
-	set(X11_Xau_FOUND TRUE)
+    set(X11_Xau_FOUND TRUE)
+    set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB})
   endif (X11_Xau_LIB)
 
   if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
-	set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB})
-	set(X11_Xdmcp_FOUND TRUE)
+      set(X11_Xdmcp_FOUND TRUE)
+      set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB})
+      set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdmcp_INCLUDE_PATH})
   endif (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
 
   if (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
-	set(X11_Xaccess_FOUND TRUE)
-	set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH})
+      set(X11_Xaccess_FOUND TRUE)
+      set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH})
+      set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xaccess_INCLUDE_PATH})
   endif (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH)
 
   if (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB)
-	set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB})
-    set(X11_Xpm_FOUND TRUE)
+      set(X11_Xpm_FOUND TRUE)
+      set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB})
+      set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xpm_INCLUDE_PATH})
   endif (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB)
 
 
-
   if (X11_Xcomposite_INCLUDE_PATH)
-    set(X11_Xcomposite_FOUND TRUE)
+     set(X11_Xcomposite_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH})
   endif (X11_Xcomposite_INCLUDE_PATH)
 
   if (X11_XTest_INCLUDE_PATH)
-    set(X11_XTest_FOUND TRUE)
+      set(X11_XTest_FOUND TRUE)
+      set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH})
   endif (X11_XTest_INCLUDE_PATH)
 
   if (X11_Xinerama_INCLUDE_PATH)
-    set(X11_Xinerama_FOUND TRUE)
+     set(X11_Xinerama_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH})
   endif (X11_Xinerama_INCLUDE_PATH)
 
   if (X11_Xfixes_INCLUDE_PATH)
-    set(X11_Xfixes_FOUND TRUE)
+     set(X11_Xfixes_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xfixes_INCLUDE_PATH})
   endif (X11_Xfixes_INCLUDE_PATH)
 
   if (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
-    set(X11_Xrender_FOUND TRUE)
+     set(X11_Xrender_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrender_INCLUDE_PATH})
   endif (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
 
   if (X11_Xrandr_INCLUDE_PATH)
-    set(X11_Xrandr_FOUND TRUE)
+     set(X11_Xrandr_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH})
   endif (X11_Xrandr_INCLUDE_PATH)
 
   if (X11_Xxf86misc_INCLUDE_PATH)
-    set(X11_Xxf86misc_FOUND TRUE)
+     set(X11_Xxf86misc_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH})
   endif (X11_Xxf86misc_INCLUDE_PATH)
 
   if (X11_Xcursor_INCLUDE_PATH)
-    set(X11_Xcursor_FOUND TRUE)
+     set(X11_Xcursor_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcursor_INCLUDE_PATH})
   endif (X11_Xcursor_INCLUDE_PATH)
 
   if (X11_Xscreensaver_INCLUDE_PATH)
-	set(X11_Xscreensaver_FOUND TRUE)
+     set(X11_Xscreensaver_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xscreensaver_INCLUDE_PATH})
   endif (X11_Xscreensaver_INCLUDE_PATH)
 
   if (X11_dpms_INCLUDE_PATH)
-	set(X11_dpms_FOUND TRUE)
+     set(X11_dpms_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_dpms_INCLUDE_PATH})
   endif (X11_dpms_INCLUDE_PATH)
 
   if (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
-	set(X11_Xkb_FOUND TRUE)
+     set(X11_Xkb_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} )
   endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH)
 
   if (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
-    set(X11_kompmgr_FOUND TRUE)
+     set(X11_kompmgr_FOUND TRUE)
+     set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH})
   endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH)
 
   # Deprecated variable for backwards compatibility with CMake 1.4