napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Shuffle library order to satisfy CI build

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-02 14:10:35 +01:00
parent 2bd3f1d8c1
commit 486cdaeeb6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -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 - Calamares now sets the C++ standard for compilation to C++17; this
is for better compatibility and fewer warnings when building with is for better compatibility and fewer warnings when building with
modern KDE Frameworks and KPMcore 4.2.0. modern KDE Frameworks and KPMcore 4.2.0.
- Vietnamese translations have been added. Welcome! - Vietnamese translations have been added. Welcome! (Thanks TTran)
## Modules ## ## Modules ##
- The *keyboard* and *keyboardq* modules now share backend code - The *keyboard* and *keyboardq* modules now share backend code
and handle non-ASCII layouts better (for setting passwords 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) # # 3.2.32.1 (2020-10-17) #

3
src/modules/users/CMakeLists.txt
View File

@ -44,6 +44,7 @@ calamares_add_library(
${_users_src} ${_users_src}
LINK_LIBRARIES LINK_LIBRARIES
Qt5::DBus Qt5::DBus
${CRYPT_LIBRARIES}
) )
calamares_add_plugin( users calamares_add_plugin( users
@ -57,10 +58,10 @@ calamares_add_plugin( users
RESOURCES RESOURCES
users.qrc users.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
users_internal
calamaresui calamaresui
${CRYPT_LIBRARIES} ${CRYPT_LIBRARIES}
${USER_EXTRA_LIB} ${USER_EXTRA_LIB}
users_internal
SHARED_LIB SHARED_LIB
) )

2
src/modules/usersq/CMakeLists.txt
View File

@ -36,10 +36,10 @@ calamares_add_plugin( usersq
RESOURCES RESOURCES
usersq.qrc usersq.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
users_internal
calamaresui calamaresui
${CRYPT_LIBRARIES} ${CRYPT_LIBRARIES}
${USER_EXTRA_LIB} ${USER_EXTRA_LIB}
Qt5::DBus Qt5::DBus
users_internal
SHARED_LIB SHARED_LIB
) )