-use KDE4_INCLUDES instead of KDE4_INCLUDE_DIR and QT_INCLUDES
Alex svn path=/trunk/KDE/kdebase/workspace/; revision=522728 The following changes were in SVN, but were removed from git: M wallpapers/CMakeLists.txt
This commit is contained in:
parent
dca6e7fc4b
commit
d3fe666661
31 changed files with 31 additions and 31 deletions
|
@ -15,7 +15,7 @@ if(X11_kompmgr_FOUND)
|
|||
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( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( cli_installer )
|
||||
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
kde4_header()
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -2,7 +2,7 @@ kde4_header()
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
kde4_header()
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
kde4_header()
|
||||
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
kde4_header()
|
||||
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -3,7 +3,7 @@ kde4_header()
|
|||
add_subdirectory( kwinoptions )
|
||||
add_subdirectory( kwindecoration )
|
||||
add_subdirectory( kwinrules )
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDES} )
|
||||
|
||||
ADD_DEFINITIONS(-DKCMRULES)
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
kde4_header()
|
||||
|
||||
add_subdirectory( decobenchmark )
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
kde4_header()
|
||||
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${KDE4_INCLUDES} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
Loading…
Reference in a new issue