From 632c3508a719dff4568f11277acb84548195ed22 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 3 Nov 2022 12:57:27 +0200 Subject: [PATCH] build: Move libkwineffects specific ecm_setup_qtplugin_macro_names to src/libkwineffects --- CMakeLists.txt | 13 ------------- src/libkwineffects/CMakeLists.txt | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f203255a38..649aa7fea6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(ECMConfiguredInstall) include(ECMQtDeclareLoggingCategory) -include(ECMSetupQtPluginMacroNames) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Concurrent @@ -445,18 +444,6 @@ if (KF5DocTools_FOUND) add_subdirectory(doc) endif() -ecm_setup_qtplugin_macro_names( - JSON_ARG2 - "KWIN_EFFECT_FACTORY" - JSON_ARG3 - "KWIN_EFFECT_FACTORY_ENABLED" - "KWIN_EFFECT_FACTORY_SUPPORTED" - JSON_ARG4 - "KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED" - CONFIG_CODE_VARIABLE - PACKAGE_SETUP_AUTOMOC_VARIABLES -) - add_subdirectory(data) add_subdirectory(kconf_update) add_subdirectory(src) diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt index 116e94f0d6..fba4bd1913 100644 --- a/src/libkwineffects/CMakeLists.txt +++ b/src/libkwineffects/CMakeLists.txt @@ -1,5 +1,6 @@ ########### next target ############### include(ECMSetupVersion) +include(ECMSetupQtPluginMacroNames) ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KWINEFFECTS @@ -8,6 +9,18 @@ ecm_setup_version(${PROJECT_VERSION} SOVERSION 14 ) +ecm_setup_qtplugin_macro_names( + JSON_ARG2 + "KWIN_EFFECT_FACTORY" + JSON_ARG3 + "KWIN_EFFECT_FACTORY_ENABLED" + "KWIN_EFFECT_FACTORY_SUPPORTED" + JSON_ARG4 + "KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED" + CONFIG_CODE_VARIABLE + PACKAGE_SETUP_AUTOMOC_VARIABLES +) + ### effects lib ### set(kwin_EFFECTSLIB_SRCS anidata.cpp