mirrors/sddm
0
0
Fork 0
mirror of https://github.com/sddm/sddm.git synced 2024-11-23 10:04:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sddm-greeter for Qt 5 and Qt 6 coinstallable

Browse Source 
When not building for Qt 5, give the sddm-greeter binary a Qt version suffix.
Also version the translation directory.
This commit is contained in:
Fabian Vogt 2023-09-09 15:30:35 +02:00
parent f5e580e865
commit 27cae1af06
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -186,7 +186,7 @@ set(ACCOUNTSSERVICE_DATA_DIR "/var/lib/AccountsService"
set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory")
set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file")
set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file")
set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory")
set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations-qt${QT_MAJOR_VERSION}" CACHE PATH "Components translations directory")
set(SDDM_INITIAL_VT "1" CACHE STRING "Initial tty to use")

22
src/greeter/CMakeLists.txt
View File

@ -1,3 +1,14 @@
if(QT_MAJOR_VERSION EQUAL "5")
# Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
# might still be running and only know about "sddm-greeter". Keeping the
# previous name around also helps users calling it directly.
set(GREETER_TARGET sddm-greeter)
else()
set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
endif()
message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
include_directories(
"${CMAKE_SOURCE_DIR}/src/common"
"${CMAKE_BINARY_DIR}/src/common"
@ -28,18 +39,17 @@ configure_file("theme.qrc" "theme.qrc")
qt_add_resources(RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/theme.qrc)
add_executable(sddm-greeter ${GREETER_SOURCES} ${RESOURCES})
target_link_libraries(sddm-greeter
add_executable(${GREETER_TARGET} ${GREETER_SOURCES} ${RESOURCES})
target_link_libraries(${GREETER_TARGET}
Qt${QT_MAJOR_VERSION}::Quick
${LIBXCB_LIBRARIES}
${LIBXKB_LIBRARIES})
if(JOURNALD_FOUND)
target_link_libraries(sddm-greeter ${JOURNALD_LIBRARIES})
target_link_libraries(${GREETER_TARGET} ${JOURNALD_LIBRARIES})
endif()
# Translations
add_dependencies(sddm-greeter components-translation)
add_dependencies(sddm-greeter themes-translation)
add_dependencies(${GREETER_TARGET} components-translation themes-translation)
install(TARGETS sddm-greeter DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(TARGETS ${GREETER_TARGET} DESTINATION "${CMAKE_INSTALL_BINDIR}")