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] Let AUTOMOC process library headers (#7638)

Browse source 
The 13 libraries using qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) listed their\nheaders twice and depended on a generated source list. Add the headers to the\ntarget sources directly and delete the qt6_wrap_cpp call; AUTOMOC scans them\nand generates the same moc output.\n\nThe change exposed that server_card_counter_test never defined the rng global\nthat the server remote library references; every sibling server test does.\nGive the test the same definition so the target links.\n\nVerification: full client, Oracle, server and test build passed.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-10-31 18:49:05 +01:00 • committed by GitHub
parent 345b0e8ba9
commit 52d3978f84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 18 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
View file

@ -6,9 +6,7 @@ set(HEADERS abstract_client.h latency_tracker.h)
set(SOURCES abstract_client.cpp latency_tracker.cpp)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
add_library(libcockatrice_network_client_abstract STATIC ${HEADERS} ${SOURCES})
add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)

4
libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
View file

@ -6,9 +6,7 @@ set(HEADERS local_client.h)
set(SOURCES local_client.cpp)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
add_library(libcockatrice_network_client_local STATIC ${HEADERS} ${SOURCES})
add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)

4
libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
View file

@ -6,9 +6,7 @@ set(HEADERS remote_client.h)
set(SOURCES remote_client.cpp)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
add_library(libcockatrice_network_client_remote STATIC ${HEADERS} ${SOURCES})
add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)

4
libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
View file

@ -6,9 +6,7 @@ set(HEADERS local_server.h local_server_interface.h)
set(SOURCES local_server.cpp local_server_interface.cpp)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
add_library(libcockatrice_network_server_local STATIC ${HEADERS} ${SOURCES})
add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)

4
libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
View file

@ -29,11 +29,9 @@ set(HEADERS
serverinfo_user_container.h
)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
add_library(
libcockatrice_network_server_remote STATIC
${MOC_SOURCES}
${HEADERS}
game/dump_zone_range.cpp
game/server_abstract_participant.cpp
game/server_abstract_player.cpp