vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use set(CMAKE_INCLUDE_CURRENT_DIR ON) in the toplevel CMakeLists.txt, and we don't need to include 

${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in each and every file anymore [only when subdirs might depend on that].

Also ran a script which makes sure that ${KDE4_INCLUDE_DIR} and ${QT_INCLUDES} are added -last-,
so that installed headers are not preferred over (possibly more uptodate) local headers.

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

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

M	wallpapers/CMakeLists.txt
icc-effect-5.14.5
David Faure 2006-03-23 19:24:10 +00:00
parent 8b2d8643b7
commit 090f6dcbfa
32 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,8 +14,8 @@ if(X11_kompmgr_FOUND)
add_subdirectory(kompmgr)
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( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/lib)
########### next target ###############

3
clients/CMakeLists.txt
View File

@ -10,9 +10,6 @@ add_subdirectory( quartz )
add_subdirectory( redmond )
add_subdirectory( web )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### install files ###############

2
clients/b2/CMakeLists.txt
View File

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/b2/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/default/CMakeLists.txt
View File

@ -2,8 +2,7 @@ kde4_header()
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/default/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/keramik/CMakeLists.txt
View File

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/keramik/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/kwmtheme/CMakeLists.txt
View File

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( cli_installer )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/kwmtheme/cli_installer/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/laptop/CMakeLists.txt
View File

@ -1,6 +1,6 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/modernsystem/CMakeLists.txt
View File

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/modernsystem/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

4
clients/plastik/CMakeLists.txt
View File

@ -1,8 +1,8 @@
kde4_header()
add_subdirectory( config )
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/plastik/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/quartz/CMakeLists.txt
View File

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( config )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/quartz/config/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
clients/redmond/CMakeLists.txt
View File

@ -1,6 +1,7 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/test/CMakeLists.txt
View File

@ -1,6 +1,6 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

2
clients/web/CMakeLists.txt
View File

@ -1,6 +1,6 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
data/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
kcmkwin/CMakeLists.txt
View File

@ -3,8 +3,7 @@ kde4_header()
add_subdirectory( kwinoptions )
add_subdirectory( kwindecoration )
add_subdirectory( kwinrules )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### install files ###############

3
kcmkwin/kwindecoration/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
kcmkwin/kwinoptions/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
kcmkwin/kwinrules/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib)
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
ADD_DEFINITIONS(-DKCMRULES)
########### next target ###############

3
killer/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
kompmgr/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
lib/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
oldheaders/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### install files ###############

3
pics/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### install files ###############

3
tools/CMakeLists.txt
View File

@ -1,8 +1,7 @@
kde4_header()
add_subdirectory( decobenchmark )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############

3
tools/decobenchmark/CMakeLists.txt
View File

@ -1,6 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############