From 814ff851b47cae0a37c92614b369b62509215ebf Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 13 Feb 2014 20:06:33 +0100 Subject: [PATCH] Use correct Activities, they are now a proper framework --- CMakeLists.txt | 4 ++-- kcmkwin/kwinrules/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fbcdbee0d..29bac162e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(KWIN_BUILD_SCRIPTING "Enable building of KWin with scripting support" ON) option(KWIN_BUILD_KAPPMENU "Enable building of KWin with application menu support" ON) option(KWIN_BUILD_XRENDER_COMPOSITING "Enable building of KWin with XRender Compositing support" ON) option(KWIN_BUILD_OPENGL_1_COMPOSITING "Enable support for OpenGL 1.x, automatically disabled when building for OpenGL ES 2.0" ON) -cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KActivities_FOUND" OFF) +cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF) option(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." OFF) # Binary name of KWin @@ -308,7 +308,7 @@ if(KWIN_BUILD_SCRIPTING) endif() if(KWIN_BUILD_ACTIVITIES) - set(kwin_KDE_LIBS ${kwin_KDE_LIBS} KF5::KActivities) + set(kwin_KDE_LIBS ${kwin_KDE_LIBS} KF5::Activities) endif() if(OPENGL_EGL_FOUND) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index 9c63f821ed..485b7c0a5a 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -29,7 +29,7 @@ set(kcm_libs ) if(KWIN_BUILD_ACTIVITIES) - set(kcm_libs ${kcm_libs} KF5::KActivities) + set(kcm_libs ${kcm_libs} KF5::Activities) endif() target_link_libraries(kdeinit_kwin_rules_dialog ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS})