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

2
CMakeLists.txt
View file

@ -462,5 +462,5 @@ endif()
if(Qt6_FOUND AND Qt6_VERSION_MINOR GREATER_EQUAL 3) if(Qt6_FOUND AND Qt6_VERSION_MINOR GREATER_EQUAL 3)
# Qt6.3+ requires project finalization to support translations # Qt6.3+ requires project finalization to support translations
qt6_finalize_project() qt_finalize_project()
endif() endif()

14
cockatrice/CMakeLists.txt
View file

@ -490,7 +490,7 @@ if(APPLE)
set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
endif(APPLE) endif(APPLE)
qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) qt_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
# Declare path variables # Declare path variables
set(ICONDIR set(ICONDIR
@ -511,7 +511,7 @@ set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translation
set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations") set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations") set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
qt6_add_executable( qt_add_executable(
cockatrice cockatrice
WIN32 WIN32
MACOSX_BUNDLE MACOSX_BUNDLE
@ -523,7 +523,7 @@ qt6_add_executable(
target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h") target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
qt6_add_shaders( qt_add_shaders(
cockatrice cockatrice
"onboarding_shaders" "onboarding_shaders"
PREFIX PREFIX
@ -535,7 +535,7 @@ qt6_add_shaders(
src/interface/widgets/onboarding/shaders/brand_plate.frag src/interface/widgets/onboarding/shaders/brand_plate.frag
) )
qt6_add_resources( qt_add_resources(
cockatrice cockatrice
"onboarding_qml" "onboarding_qml"
PREFIX PREFIX
@ -768,7 +768,7 @@ endif()
if(Qt6LinguistTools_FOUND) if(Qt6LinguistTools_FOUND)
#Qt6 Translations happen after the executable is built up #Qt6 Translations happen after the executable is built up
if(UPDATE_TRANSLATIONS) if(UPDATE_TRANSLATIONS)
qt6_add_translations( qt_add_translations(
cockatrice cockatrice
TS_FILES TS_FILES
${cockatrice_TS} ${cockatrice_TS}
@ -778,7 +778,7 @@ if(Qt6LinguistTools_FOUND)
cockatrice_QM cockatrice_QM
) )
else() else()
qt6_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM) qt_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM)
endif() endif()
if(UNIX) if(UNIX)
@ -804,4 +804,4 @@ if(Qt6LinguistTools_FOUND)
endforeach() endforeach()
endif() endif()
qt6_finalize_target(cockatrice) qt_finalize_target(cockatrice)

10
oracle/CMakeLists.txt
View file

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

2
servatrice/CMakeLists.txt
View file

@ -56,7 +56,7 @@ if(APPLE)
set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
endif(APPLE) endif(APPLE)
qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES}) qt_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
set(QT_DONT_USE_QTGUI TRUE) set(QT_DONT_USE_QTGUI TRUE)