From 77d489b5e50f61c4a8e968e8c1aa9f10f6359401 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 28 Sep 2023 20:50:14 +0200 Subject: [PATCH] users: repair previous "fix" The build failure on openSUSE is real, but the "fix" switched the internal library accidentally to SHARED, without installing it. It shouldn't be a library at all, really (if STATIC won't do). FIXES #2203 --- src/modules/users/CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index 8f9ee88bd..6a31f548e 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -45,17 +45,20 @@ set(_users_src ) # This part of the code is shared with the usersq module -calamares_add_library( - users_internal - EXPORT_MACRO PLUGINDLLEXPORT_PRO - TARGET_TYPE OBJECT - NO_INSTALL - NO_VERSION - SOURCES +add_library(users_internal + OBJECT ${_users_src} - LINK_LIBRARIES - ${USER_EXTRA_LIB} ) +target_link_libraries(users_internal + PRIVATE + ${USER_EXTRA_LIB} + ${Calamares_LIBRARIES} + ${qtname}::Core + ${qtname}::Gui + ${qtname}::Widgets +) +set_target_properties(users_internal PROPERTIES COMPILE_DEFINITIONS PLUGINDLLEXPORT_PRO) +calamares_automoc(users_internal) calamares_add_plugin(users TYPE viewmodule