-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/konqueror/; revision=539914
This commit is contained in:
Alexander Neundorf 2006-05-12 00:08:30 +00:00
parent 36d3903572
commit a8b01eb0aa
63 changed files with 66 additions and 69 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -4,9 +4,6 @@ project(kdepasswd)
add_subdirectory( kcm )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############
set(kdepasswd_SRCS kdepasswd.cpp passwd.cpp passwddlg.cpp )

View file

@ -1,7 +1,7 @@
kde4_header()
add_subdirectory( pics )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

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

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

@ -3,10 +3,7 @@ kde4_header()
project(kfind)
add_subdirectory( pics )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

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

View file

@ -8,9 +8,11 @@ kde4_add_kcfg_files(libkonqueror_intern_SRCS ${libkonqueror_intern_KCFG_SRCS})
add_subdirectory( client )
add_subdirectory( iconview )
add_subdirectory( listview )
if(UNIX)
add_subdirectory( shellcmdplugin )
add_subdirectory( shellcmdplugin )
endif(UNIX)
add_subdirectory( about )
add_subdirectory( pics )
add_subdirectory( sidebar )
@ -20,9 +22,10 @@ add_subdirectory( remoteencodingplugin )
add_subdirectory( kttsplugin )
add_subdirectory( dirpart )
add_subdirectory( settings )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/workspace/kcontrol/input )
add_subdirectory( tests )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/workspace/kcontrol/input ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_SOURCE_DIR}/workspace/kdesktop/ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_SOURCE_DIR}/workspace/kdesktop/ )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror )
########### next target ###############

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror )
########### next target ###############

View file

@ -3,7 +3,7 @@ kde4_header()
add_subdirectory( tiles )
add_subdirectory( indicators )
add_subdirectory( actions )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### install files ###############

View file

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

View file

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

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/konqueror )
########### next target ###############

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

@ -8,7 +8,7 @@ add_subdirectory( kio )
add_subdirectory( filetypes )
add_subdirectory( pics )
add_subdirectory( css )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### install files ###############

View file

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

View file

@ -1,7 +1,7 @@
kde4_header()
add_subdirectory( plugins )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############

View file

@ -3,7 +3,7 @@ kde4_header()
add_subdirectory( ikws )
add_subdirectory( shorturi )
add_subdirectory( localdomain )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### install files ###############

View file

@ -1,7 +1,7 @@
kde4_header()
add_subdirectory( searchproviders )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############

View file

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

View file

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

View file

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

View file

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

View file

@ -1,7 +1,7 @@
kde4_header()
add_subdirectory( uasproviders )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### next target ###############

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

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

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

@ -3,7 +3,7 @@ kde4_header()
add_subdirectory( trees )
add_subdirectory( web_module )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/kate/lib ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/kate/lib )
########### next target ###############

View file

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

View file

@ -10,7 +10,7 @@ add_subdirectory( init )
add_subdirectory( dirtree_module )
add_subdirectory( history_module )
add_subdirectory( bookmark_module )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_SOURCE_DIR}/konqueror/sidebar/ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror ${CMAKE_SOURCE_DIR}/konqueror/sidebar/ )
########### next target ###############

View file

@ -3,7 +3,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/libkonq
${CMAKE_SOURCE_DIR}/konqueror/sidebar/
${CMAKE_SOURCE_DIR}/konqueror/sidebar/trees/
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
)
########### next target ###############

View file

@ -3,7 +3,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/konqueror/sidebar/
${CMAKE_SOURCE_DIR}/konqueror/sidebar/trees/
${CMAKE_SOURCE_DIR}/libkonq
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
)
########### next target ###############

View file

@ -3,7 +3,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/libkonq
${CMAKE_SOURCE_DIR}/konqueror/sidebar/
${CMAKE_SOURCE_DIR}/konqueror/sidebar/trees/
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
)
########### next target ###############

View file

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( remote )
add_subdirectory( services )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### install files ###############

View file

@ -2,7 +2,7 @@ kde4_header()
add_subdirectory( ftp )
add_subdirectory( web )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
########### install files ###############

View file

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

View file

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

View file

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

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/konqueror/sidebar/ ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/konqueror/sidebar/ ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############

View file

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

View file

@ -5,7 +5,8 @@ project(libkonq)
add_subdirectory( pics )
add_subdirectory( favicons )
add_subdirectory( tests )
include_directories( ${KDE4_INCLUDES} )
include_directories( ${ZLIB_INCLUDE_DIR} )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${KDE4_INCLUDES} )
########### install files ###############

View file

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

View file

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

View file

@ -2,7 +2,7 @@ kde4_header()
if(KDE4_BUILD_TESTS)
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
# Tests don't need to go into toplevel/bin, they are fine in the current dir.
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )

View file

@ -4,7 +4,6 @@ if (X11_Xt_LIB)
add_subdirectory( viewer )
add_subdirectory( test )
include_directories( ${KDE4_INCLUDES} )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/libltdl ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/libltdl ${CMAKE_CURRENT_BINARY_DIR}/.. )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/nsplugins ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/nsplugins )
########### next target ###############

View file

@ -1,5 +1,5 @@
kde4_header()
include_directories( ${CMAKE_SOURCE_DIR}/nsplugins ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
include_directories( ${CMAKE_SOURCE_DIR}/nsplugins )
########### next target ###############