-use KDE4_INCLUDES instead of KDE4_INCLUDE_DIR and QT_INCLUDES

Alex svn path=/trunk/KDE/kdebase/konsole/; revision=522728
20 years ago · f0983d8000
parent 9e3f03d15a
commit f0983d8000
7 changed files with 7 additions and 7 deletions
--- 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 ###############
--- 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 ###############
--- 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 ###############
--- 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 ###############
--- 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 ###############
--- 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 ###############
--- 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 ###############