-add FONTCONFIG_INCLUDE_DIR where required

-cleanup the toplevel CMakeLists.txt a bit -remove include_directories( CMAKE_CURRENT_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR) in the subdirs, since this is done now automatically by cmake (the CMAKE_INCLUDE_CURRENT_DIR option -include_directories(KDE4_INCLUDES) in the toplevel CMakeLists.txt, so it doesn't have to be done in every subdir Alex svn path=/trunk/KDE/kdebase/workspace/; revision=539914 The following changes were in SVN, but were removed from git: M wallpapers/CMakeLists.txt
2006-05-12 00:08:30 +00:00 · 2006-05-12 00:08:30 +00:00 · e4e2266d9c
commit e4e2266d9c
parent 7f7ce52d78
31 changed files with 31 additions and 31 deletions
--- 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_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )

 ########### next target ###############

--- a/clients/default/config/CMakeLists.txt
+++ b/clients/default/config/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- a/clients/kwmtheme/CMakeLists.txt
+++ b/clients/kwmtheme/CMakeLists.txt
@ -2,7 +2,7 @@ kde4_header()

 add_subdirectory( cli_installer ) 

-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/clients/kwmtheme/cli_installer/CMakeLists.txt
+++ b/clients/kwmtheme/cli_installer/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- a/clients/modernsystem/config/CMakeLists.txt
+++ b/clients/modernsystem/config/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- a/clients/plastik/config/CMakeLists.txt
+++ b/clients/plastik/config/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/clients/quartz/CMakeLists.txt
+++ b/clients/quartz/CMakeLists.txt
@ -2,7 +2,7 @@ kde4_header()

 add_subdirectory( config ) 

-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/clients/quartz/config/CMakeLists.txt
+++ b/clients/quartz/config/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )



--- a/clients/test/CMakeLists.txt
+++ b/clients/test/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/clients/web/CMakeLists.txt
+++ b/clients/web/CMakeLists.txt
@ -1,6 +1,6 @@
 kde4_header()

-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+


 ########### install files ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )


 ########### next target ###############
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- 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_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )

 ADD_DEFINITIONS(-DKCMRULES)
 ########### next target ###############
--- a/killer/CMakeLists.txt
+++ b/killer/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/kompmgr/CMakeLists.txt
+++ b/kompmgr/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/oldheaders/CMakeLists.txt
+++ b/oldheaders/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### install files ###############
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### install files ###############
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@ -1,7 +1,7 @@
 kde4_header()

 add_subdirectory( decobenchmark ) 
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############
--- a/tools/decobenchmark/CMakeLists.txt
+++ b/tools/decobenchmark/CMakeLists.txt
@ -1,5 +1,5 @@
 kde4_header()
-include_directories( ${KDE4_INCLUDES} )
+


 ########### next target ###############