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/plasma/lib/; revision=521887
This commit is contained in:
David Faure 2006-03-23 19:24:10 +00:00
parent 7dd56dca16
commit 31ffe09826
2 changed files with 2 additions and 4 deletions

View File

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

View File

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