From 486cdaeeb6923a5819023ae18bf58e6c7afeec35 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 2 Nov 2020 14:10:35 +0100 Subject: [PATCH] [users] Shuffle library order to satisfy CI build --- CHANGES | 6 ++++-- src/modules/users/CMakeLists.txt | 3 ++- src/modules/usersq/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 73c99cf9b..85accf44d 100644 --- a/CHANGES +++ b/CHANGES @@ -20,12 +20,14 @@ This release contains contributions from (alphabetically by first name): - Calamares now sets the C++ standard for compilation to C++17; this is for better compatibility and fewer warnings when building with modern KDE Frameworks and KPMcore 4.2.0. - - Vietnamese translations have been added. Welcome! + - Vietnamese translations have been added. Welcome! (Thanks TTran) ## Modules ## - The *keyboard* and *keyboardq* modules now share backend code and handle non-ASCII layouts better (for setting passwords - and usernames). + and usernames). (Thanks Artem) + - Various cleanups and documentation improvements in the *partition* + module, and configurable GPT name for swap. (Thanks Gaƫl) # 3.2.32.1 (2020-10-17) # diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index 8b8e87080..92a9e03e7 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -44,6 +44,7 @@ calamares_add_library( ${_users_src} LINK_LIBRARIES Qt5::DBus + ${CRYPT_LIBRARIES} ) calamares_add_plugin( users @@ -57,10 +58,10 @@ calamares_add_plugin( users RESOURCES users.qrc LINK_PRIVATE_LIBRARIES + users_internal calamaresui ${CRYPT_LIBRARIES} ${USER_EXTRA_LIB} - users_internal SHARED_LIB ) diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt index 951359c77..7e3fffb8d 100644 --- a/src/modules/usersq/CMakeLists.txt +++ b/src/modules/usersq/CMakeLists.txt @@ -36,10 +36,10 @@ calamares_add_plugin( usersq RESOURCES usersq.qrc LINK_PRIVATE_LIBRARIES + users_internal calamaresui ${CRYPT_LIBRARIES} ${USER_EXTRA_LIB} Qt5::DBus - users_internal SHARED_LIB )