yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust to renamed activities libraries

Browse source
This commit is contained in:
Nicolas Fella 2023-11-23 21:48:01 +01:00
parent cc4eac4c85
commit 8ec88aa3bf
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -115,12 +115,12 @@ set_package_properties(KWayland PROPERTIES
) )
# optional frameworks # optional frameworks
find_package(KF6Activities ${PROJECT_VERSION} CONFIG) find_package(PlasmaActivities ${PROJECT_VERSION} CONFIG)
set_package_properties(KF6Activities PROPERTIES set_package_properties(PlasmaActivities PROPERTIES
PURPOSE "Enable building of KWin with kactivities support" PURPOSE "Enable building of KWin with kactivities support"
TYPE OPTIONAL TYPE OPTIONAL
) )
add_feature_info("KF6Activities" KF6Activities_FOUND "Enable building of KWin with kactivities support") add_feature_info("PlasmaActivities" PlasmaActivities_FOUND "Enable building of KWin with kactivities support")
find_package(KF6DocTools ${KF6_MIN_VERSION} CONFIG) find_package(KF6DocTools ${KF6_MIN_VERSION} CONFIG)
set_package_properties(KF6DocTools PROPERTIES set_package_properties(KF6DocTools PROPERTIES
@ -371,7 +371,7 @@ ecm_find_qmlmodule(org.kde.plasma.core 2.0)
ecm_find_qmlmodule(org.kde.plasma.components 2.0) ecm_find_qmlmodule(org.kde.plasma.components 2.0)
########### configure tests ############### ########### configure tests ###############
cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF6Activities_FOUND" OFF) cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "PlasmaActivities_FOUND" OFF)
option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON) option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON)
set(HAVE_GLX ${epoxy_HAS_GLX}) set(HAVE_GLX ${epoxy_HAS_GLX})

2
autotests/integration/CMakeLists.txt
View file

@ -139,7 +139,7 @@ if (TARGET K::KPipeWire)
endif() endif()
if (KWIN_BUILD_ACTIVITIES) if (KWIN_BUILD_ACTIVITIES)
integrationTest(NAME testActivities SRCS activities_test.cpp LIBS XCB::ICCCM KF6::Activities) integrationTest(NAME testActivities SRCS activities_test.cpp LIBS XCB::ICCCM Plasma::Activities)
endif() endif()
add_subdirectory(scripting) add_subdirectory(scripting)

2
src/CMakeLists.txt
View file

@ -322,7 +322,7 @@ add_subdirectory(xwayland)
if (KWIN_BUILD_ACTIVITIES) if (KWIN_BUILD_ACTIVITIES)
target_sources(kwin PRIVATE activities.cpp) target_sources(kwin PRIVATE activities.cpp)
target_link_libraries(kwin PRIVATE KF6::Activities) target_link_libraries(kwin PRIVATE Plasma::Activities)
endif() endif()
if (KWIN_BUILD_SCREENLOCKER) if (KWIN_BUILD_SCREENLOCKER)

2
src/activities.h
View file

@ -13,7 +13,7 @@
#include <QObject> #include <QObject>
#include <QStringList> #include <QStringList>
#include <kactivities/controller.h> #include <PlasmaActivities/Controller>
namespace KActivities namespace KActivities
{ {

2
src/kcms/rules/CMakeLists.txt
View file

@ -37,7 +37,7 @@ set(kcm_libs
) )
if (KWIN_BUILD_ACTIVITIES) if (KWIN_BUILD_ACTIVITIES)
set(kcm_libs ${kcm_libs} KF6::Activities) set(kcm_libs ${kcm_libs} Plasma::Activities)
endif() endif()
target_link_libraries(KWinRulesObjects ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS}) target_link_libraries(KWinRulesObjects ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS})

2
src/kcms/rules/rulesmodel.h
View file

@ -16,7 +16,7 @@
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#if KWIN_BUILD_ACTIVITIES #if KWIN_BUILD_ACTIVITIES
#include <KActivities/Consumer> #include <PlasmaActivities/Consumer>
#endif #endif
namespace KWin namespace KWin

2
src/useractions.cpp
View file

@ -37,7 +37,7 @@
#if KWIN_BUILD_ACTIVITIES #if KWIN_BUILD_ACTIVITIES
#include "activities.h" #include "activities.h"
#include <kactivities/info.h> #include <PlasmaActivities/Info>
#endif #endif
#include "appmenu.h" #include "appmenu.h"