jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-05 01:23:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Build] Use versionless Qt CMake commands (#7639)

Browse source 
* [Build] Use versionless Qt CMake commands

Replace the versioned qt6_add_executable, qt6_add_resources, qt6_add_shaders,\nqt6_add_translations and qt6_wrap_cpp calls with their unversioned forms.\nAll five are documented as available at the project's 6.4 minimum and accept\nthe same arguments.\n\nVerification: full client, Oracle, server and test build passed.

* versionless qt_finalize_target and _project

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: tooomm <tooomm@users.noreply.github.com>
This commit is contained in:
BruebachL 2026-10-31 18:53:00 +01:00 • committed by GitHub
parent d4002dc52b
commit ae43659b91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oracle/CMakeLists.txt
View file

@ -63,7 +63,7 @@ set(oracle_RESOURCES oracle.qrc)
# ------------------------
# Qt resources
# ------------------------
qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
qt_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
# ------------------------
# Include directories
@ -108,7 +108,7 @@ set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations")
set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
# Qt6 Translations are linked after the executable is created in manual mode
qt6_add_executable(
qt_add_executable(
oracle
WIN32
MACOSX_BUNDLE
@ -283,7 +283,7 @@ endif()
if(Qt6LinguistTools_FOUND)
#Qt6 Translations happen after the executable is built up
if(UPDATE_TRANSLATIONS)
qt6_add_translations(
qt_add_translations(
oracle
TS_FILES
${oracle_TS}
@ -293,7 +293,7 @@ if(Qt6LinguistTools_FOUND)
oracle_QM
)
else()
qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)
qt_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)
endif()
if(UNIX)
@ -319,4 +319,4 @@ if(Qt6LinguistTools_FOUND)
endforeach()
endif()
qt6_finalize_target(oracle)
qt_finalize_target(oracle)