From af2a7fbf69f1fd91190b69e38746b913bd1754da Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 24 Jul 2019 17:07:29 +0100 Subject: [PATCH] Compile package structure plugins into expected subdirectory Summary: This means they're found by unit tests pre-installation Test Plan: Removed installed files Ran make (but not make install) ConfigModelTest now passes Reviewers: #plasma, apol Reviewed By: apol Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D22682 --- src/plasma/packagestructure/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plasma/packagestructure/CMakeLists.txt b/src/plasma/packagestructure/CMakeLists.txt index 9d62638b9..efd7157e0 100644 --- a/src/plasma/packagestructure/CMakeLists.txt +++ b/src/plasma/packagestructure/CMakeLists.txt @@ -2,6 +2,12 @@ function(install_package_structure name) add_library(${name}_packagestructure MODULE ${name}package.cpp packages.cpp) target_link_libraries(${name}_packagestructure PRIVATE KF5::Package KF5::Plasma KF5::Declarative KF5::I18n) install(TARGETS ${name}_packagestructure DESTINATION ${KDE_INSTALL_PLUGINDIR}/kpackage/packagestructure) + + set_target_properties( + ${name}_packagestructure + PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kpackage/packagestructure" + ) + endfunction() install_package_structure(plasmageneric)