From 9874187099aa39fbd8c1f7068603a8c52c479aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 18 Mar 2014 12:08:14 +0100 Subject: [PATCH] [kwin] Add a KWIN_SOURCE_DIR to the CMakeLists.txt This is used to get to KWin's sources instead of KDEBASE_WORKSPACE_SOURCE_DIR. --- CMakeLists.txt | 1 + kcmkwin/kwindecoration/CMakeLists.txt | 4 ++-- kcmkwin/kwinscreenedges/CMakeLists.txt | 2 -- kcmkwin/kwintabbox/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e72288eef..8ccd4dc359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ set(KWIN_VERSION_MAJOR 4) set(KWIN_VERSION_MINOR 90) set(KWIN_VERSION_PATCH 1) set(KWIN_VERSION ${KWIN_VERSION_MAJOR}.${KWIN_VERSION_MINOR}.${KWIN_VERSION_PATCH} ) +set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) if(KWIN_PLASMA_ACTIVE) set(KWIN_BUILD_DECORATIONS OFF) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 1e27973087..620ffead58 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,9 +1,9 @@ # need a header file from Aurorae sources include_directories( - ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/clients/aurorae/src/lib + ${KWIN_SOURCE_DIR}/clients/aurorae/src/lib ) -set(AURORAE_SOURCE_DIR ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/clients/aurorae/src/lib/) +set(AURORAE_SOURCE_DIR ${KWIN_SOURCE_DIR}/clients/aurorae/src/lib/) set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt index b9c07b1806..4e30e70454 100644 --- a/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin ) - set( kcm_kwinscreenedges_PART_SRCS main.cpp diff --git a/kcmkwin/kwintabbox/CMakeLists.txt b/kcmkwin/kwintabbox/CMakeLists.txt index 047381d378..e736b449dc 100644 --- a/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kcmkwin/kwintabbox/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/) +include_directories( ${KWIN_SOURCE_DIR}/tabbox ${KWIN_SOURCE_DIR}) ########### next target ############### @@ -6,7 +6,7 @@ set(kcm_kwintabbox_PART_SRCS main.cpp layoutpreview.cpp thumbnailitem.cpp - ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/tabboxconfig.cpp + ${KWIN_SOURCE_DIR}/tabbox/tabboxconfig.cpp ) qt5_wrap_ui( kcm_kwintabbox_PART_SRCS main.ui )