From 1e3214ed731fc3c277f9c9892a2b7f27b926ee2f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 22 Jun 2007 16:32:06 +0000 Subject: [PATCH] include cleanup to separate workspace svn path=/trunk/KDE/kdebase/workspace/; revision=678951 --- CMakeLists.txt | 12 +++++++----- clients/b2/CMakeLists.txt | 3 --- clients/default/CMakeLists.txt | 2 -- clients/keramik/CMakeLists.txt | 3 --- clients/laptop/CMakeLists.txt | 3 --- clients/modernsystem/CMakeLists.txt | 3 --- clients/oxygen/CMakeLists.txt | 2 -- clients/plastik/CMakeLists.txt | 3 --- clients/redmond/CMakeLists.txt | 4 ---- data/CMakeLists.txt | 2 +- kcmkwin/kwindecoration/CMakeLists.txt | 3 --- kcmkwin/kwineffects/CMakeLists.txt | 3 --- kcmkwin/kwinrules/CMakeLists.txt | 5 ----- 13 files changed, 8 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00b4e724c7..319c299fdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,18 +4,20 @@ project(kwin) add_definitions (-DQT3_SUPPORT) add_subdirectory( lib ) -add_subdirectory( killer ) -add_subdirectory( kcmkwin ) -add_subdirectory( clients ) -add_subdirectory( effects ) -add_subdirectory( data ) include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/effects ) +add_subdirectory( killer ) +add_subdirectory( kcmkwin ) +add_subdirectory( clients ) +add_subdirectory( effects ) +add_subdirectory( data ) + configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index 3a85df66fe..698bf4d617 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -1,9 +1,6 @@ add_subdirectory( config ) -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kwin3_b2_PART_SRCS b2client.cpp) diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt index df65a1d129..d32aa294f4 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -1,8 +1,6 @@ add_subdirectory( config ) -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - ########### next target ############### set(kwin3_default_PART_SRCS kdedefault.cpp) diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt index be580b0ea7..711ff34d3e 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -1,9 +1,6 @@ add_subdirectory( config ) -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kwin3_keramik_PART_SRCS keramik.cpp ) diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index d452635c49..6220586966 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -1,7 +1,4 @@ -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kwin3_laptop_PART_SRCS laptopclient.cpp) diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index 43a8e20435..021ad67c7c 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -1,9 +1,6 @@ add_subdirectory( config ) -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kwin3_modernsys_PART_SRCS modernsys.cpp) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index 681857206f..32cde825b1 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - ########### next target ############### set(kwin_oxy_SRCS diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt index 91adf5bea3..63fdb3ccb7 100644 --- a/clients/plastik/CMakeLists.txt +++ b/clients/plastik/CMakeLists.txt @@ -1,9 +1,6 @@ add_subdirectory( config ) -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kwin3_plastik_PART_SRCS diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index 7d374aeb08..92df20a536 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -1,8 +1,4 @@ -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - - ########### next target ############### set(kwin3_redmond_PART_SRCS redmond.cpp) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 8b88ced64a..07c119922e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,5 +1,5 @@ -set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml) +set(kwin_xml ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml) ########### next target ############### diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index dee3d5cc88..28fabaf34a 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,6 +1,3 @@ -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) diff --git a/kcmkwin/kwineffects/CMakeLists.txt b/kcmkwin/kwineffects/CMakeLists.txt index d2d7335ff2..f3dff5c390 100644 --- a/kcmkwin/kwineffects/CMakeLists.txt +++ b/kcmkwin/kwineffects/CMakeLists.txt @@ -1,6 +1,3 @@ -include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) - - ########### next target ############### set(kcm_kwineffects_PART_SRCS main.cpp ) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index c7a819a912..eb04105507 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -1,8 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../../lib # KWin library dir - ${CMAKE_CURRENT_BINARY_DIR}/../../ # main KWin dir -) - ADD_DEFINITIONS(-DKCMRULES) ########### next target ###############