diff --git a/CMakeLists.txt b/CMakeLists.txt index da9da66b13..f00b846efc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(ECMConfiguredInstall) include(ECMQtDeclareLoggingCategory) +include(ECMSetupQtPluginMacroNames) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Concurrent @@ -419,6 +420,18 @@ add_definitions( -DEGL_NO_PLATFORM_SPECIFIC_TYPES ) +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_KWINEFFECTS_AUTOMOC_VARIABLES +) + if (KF6DocTools_FOUND) add_subdirectory(doc) kdoctools_install(po) diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt index ca6350fd23..2af5c07992 100644 --- a/src/libkwineffects/CMakeLists.txt +++ b/src/libkwineffects/CMakeLists.txt @@ -1,6 +1,5 @@ ########### next target ############### include(ECMSetupVersion) -include(ECMSetupQtPluginMacroNames) ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KWINEFFECTS @@ -9,18 +8,6 @@ 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 diff --git a/src/libkwineffects/KWinEffectsConfig.cmake.in b/src/libkwineffects/KWinEffectsConfig.cmake.in index 8cc0b1e7ce..710b1cc789 100644 --- a/src/libkwineffects/KWinEffectsConfig.cmake.in +++ b/src/libkwineffects/KWinEffectsConfig.cmake.in @@ -7,5 +7,5 @@ find_dependency(KF6Config "@KF6_MIN_VERSION@") find_dependency(KF6CoreAddons "@KF6_MIN_VERSION@") find_dependency(KF6WindowSystem "@KF6_MIN_VERSION@") -@PACKAGE_SETUP_AUTOMOC_VARIABLES@ +@PACKAGE_SETUP_KWINEFFECTS_AUTOMOC_VARIABLES@ include("${CMAKE_CURRENT_LIST_DIR}/KWinEffectsTargets.cmake")