From f0983d8000ffca3d77847580ab061a988094a6a8 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf 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/konsole/; revision=522728 --- CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- doc/VT100/CMakeLists.txt | 2 +- konsole/CMakeLists.txt | 2 +- other/CMakeLists.txt | 2 +- other/icons/CMakeLists.txt | 2 +- settings/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 735b5ed2..bffbe8ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory( konsole ) add_subdirectory( other ) add_subdirectory( doc ) add_subdirectory( settings ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### install files ############### diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 5250364a..6f6664c2 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,7 @@ kde4_header() add_subdirectory( VT100 ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### install files ############### diff --git a/doc/VT100/CMakeLists.txt b/doc/VT100/CMakeLists.txt index eeb36454..9612acbe 100644 --- a/doc/VT100/CMakeLists.txt +++ b/doc/VT100/CMakeLists.txt @@ -1,5 +1,5 @@ kde4_header() -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### install files ############### diff --git a/konsole/CMakeLists.txt b/konsole/CMakeLists.txt index a374227b..6f28f144 100644 --- a/konsole/CMakeLists.txt +++ b/konsole/CMakeLists.txt @@ -1,5 +1,5 @@ kde4_header() -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### next target ############### diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt index 5fb80f81..74ff6bf4 100644 --- a/other/CMakeLists.txt +++ b/other/CMakeLists.txt @@ -1,7 +1,7 @@ kde4_header() add_subdirectory( icons ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### install files ############### diff --git a/other/icons/CMakeLists.txt b/other/icons/CMakeLists.txt index 1d485f3f..983be8d6 100644 --- a/other/icons/CMakeLists.txt +++ b/other/icons/CMakeLists.txt @@ -1,5 +1,5 @@ kde4_header() -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### install files ############### diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt index 8fae6b31..bf393c36 100644 --- a/settings/CMakeLists.txt +++ b/settings/CMakeLists.txt @@ -1,5 +1,5 @@ kde4_header() -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ) ########### next target ###############