From d3fe66666195ad9c07ba113b3593ef392725f0bc Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 26 Mar 2006 14:52:52 +0000
Subject: [PATCH] -use KDE4_INCLUDES instead of KDE4_INCLUDE_DIR and
 QT_INCLUDES

Alex

svn path=/trunk/KDE/kdebase/workspace/; revision=522728

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
---
 CMakeLists.txt                                | 2 +-
 clients/b2/CMakeLists.txt                     | 2 +-
 clients/b2/config/CMakeLists.txt              | 2 +-
 clients/default/CMakeLists.txt                | 2 +-
 clients/default/config/CMakeLists.txt         | 2 +-
 clients/keramik/CMakeLists.txt                | 2 +-
 clients/keramik/config/CMakeLists.txt         | 2 +-
 clients/kwmtheme/CMakeLists.txt               | 2 +-
 clients/kwmtheme/cli_installer/CMakeLists.txt | 2 +-
 clients/laptop/CMakeLists.txt                 | 2 +-
 clients/modernsystem/CMakeLists.txt           | 2 +-
 clients/modernsystem/config/CMakeLists.txt    | 2 +-
 clients/plastik/CMakeLists.txt                | 2 +-
 clients/plastik/config/CMakeLists.txt         | 2 +-
 clients/quartz/CMakeLists.txt                 | 2 +-
 clients/quartz/config/CMakeLists.txt          | 2 +-
 clients/redmond/CMakeLists.txt                | 2 +-
 clients/test/CMakeLists.txt                   | 2 +-
 clients/web/CMakeLists.txt                    | 2 +-
 data/CMakeLists.txt                           | 2 +-
 kcmkwin/CMakeLists.txt                        | 2 +-
 kcmkwin/kwindecoration/CMakeLists.txt         | 2 +-
 kcmkwin/kwinoptions/CMakeLists.txt            | 2 +-
 kcmkwin/kwinrules/CMakeLists.txt              | 2 +-
 killer/CMakeLists.txt                         | 2 +-
 kompmgr/CMakeLists.txt                        | 2 +-
 lib/CMakeLists.txt                            | 2 +-
 oldheaders/CMakeLists.txt                     | 2 +-
 pics/CMakeLists.txt                           | 2 +-
 tools/CMakeLists.txt                          | 2 +-
 tools/decobenchmark/CMakeLists.txt            | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75a8d6c504..f727bcd30e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ if(X11_kompmgr_FOUND)
 endif(X11_kompmgr_FOUND)
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/lib )
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt
index f21c994e15..3222b71ee6 100644
--- a/clients/b2/CMakeLists.txt
+++ b/clients/b2/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt
index 08d22e0248..01b5264392 100644
--- a/clients/b2/config/CMakeLists.txt
+++ b/clients/b2/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt
index ea05587a19..5ab585bac2 100644
--- a/clients/default/CMakeLists.txt
+++ b/clients/default/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 ########### next target ###############
 
diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt
index 80a35bee13..f4a047bcdb 100644
--- a/clients/default/config/CMakeLists.txt
+++ b/clients/default/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt
index de0da17327..fdffc949b2 100644
--- a/clients/keramik/CMakeLists.txt
+++ b/clients/keramik/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt
index 03e2950493..1eeceb7e9b 100644
--- a/clients/keramik/config/CMakeLists.txt
+++ b/clients/keramik/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt
index 0e2ba1d4e3..5602157680 100644
--- a/clients/kwmtheme/CMakeLists.txt
+++ b/clients/kwmtheme/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( cli_installer ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt
index a79a78eeea..6cb3f1e730 100644
--- a/clients/kwmtheme/cli_installer/CMakeLists.txt
+++ b/clients/kwmtheme/cli_installer/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt
index 899d3913d3..d6a3deeaac 100644
--- a/clients/laptop/CMakeLists.txt
+++ b/clients/laptop/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt
index 3ac070ea18..09cc776649 100644
--- a/clients/modernsystem/CMakeLists.txt
+++ b/clients/modernsystem/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt
index 0281fe2bd0..823c6b0e6e 100644
--- a/clients/modernsystem/config/CMakeLists.txt
+++ b/clients/modernsystem/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt
index 452048afef..0e37f65f8e 100644
--- a/clients/plastik/CMakeLists.txt
+++ b/clients/plastik/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config )
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt
index 73ee9f3205..f25af95aa2 100644
--- a/clients/plastik/config/CMakeLists.txt
+++ b/clients/plastik/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt
index 28f5414ecb..3761663839 100644
--- a/clients/quartz/CMakeLists.txt
+++ b/clients/quartz/CMakeLists.txt
@@ -2,7 +2,7 @@ kde4_header()
 
 add_subdirectory( config ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt
index e47c72eee1..1861a42aea 100644
--- a/clients/quartz/config/CMakeLists.txt
+++ b/clients/quartz/config/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt
index 7e8728a6af..4a5077fee0 100644
--- a/clients/redmond/CMakeLists.txt
+++ b/clients/redmond/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 
diff --git a/clients/test/CMakeLists.txt b/clients/test/CMakeLists.txt
index 519ea785b1..fab0acc0c2 100644
--- a/clients/test/CMakeLists.txt
+++ b/clients/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt
index e1a2e7e925..3fc7324b53 100644
--- a/clients/web/CMakeLists.txt
+++ b/clients/web/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 4565840492..a37e1f4a6f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt
index e00f183baf..ba1e92a782 100644
--- a/kcmkwin/CMakeLists.txt
+++ b/kcmkwin/CMakeLists.txt
@@ -3,7 +3,7 @@ kde4_header()
 add_subdirectory( kwinoptions ) 
 add_subdirectory( kwindecoration ) 
 add_subdirectory( kwinrules ) 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### install files ###############
diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt
index 7c62bcdd28..71ee32e978 100644
--- a/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kcmkwin/kwindecoration/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index 6f92aa4e69..bc9f3ff6f0 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index 43766bd652..dc44e773d8 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
 
 ADD_DEFINITIONS(-DKCMRULES)
 ########### next target ###############
diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt
index ef335165cd..b720dd0f47 100644
--- a/killer/CMakeLists.txt
+++ b/killer/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/kompmgr/CMakeLists.txt b/kompmgr/CMakeLists.txt
index 7846d7b95e..eca043fcec 100644
--- a/kompmgr/CMakeLists.txt
+++ b/kompmgr/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ae50c38e14..0e58742398 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/oldheaders/CMakeLists.txt b/oldheaders/CMakeLists.txt
index 3689f28846..327577d94c 100644
--- a/oldheaders/CMakeLists.txt
+++ b/oldheaders/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### install files ###############
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 6cc7a29b67..9c437cf5bb 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### install files ###############
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 01a8163c18..64b94051d2 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 kde4_header()
 
 add_subdirectory( decobenchmark ) 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt
index b38450efd7..671180fe28 100644
--- a/tools/decobenchmark/CMakeLists.txt
+++ b/tools/decobenchmark/CMakeLists.txt
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############