mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-24 10:23:02 -07:00
fix Qt variable name
This commit is contained in:
parent
af05c4e45d
commit
b6614beeb4
20 changed files with 41 additions and 45 deletions
|
|
@ -10,5 +10,5 @@ add_library(libcockatrice_network INTERFACE)
|
|||
target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
|
||||
libcockatrice_network INTERFACE ${QT_MODULES_COCKATRICE} libcockatrice_network_client libcockatrice_network_server
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ target_include_directories(libcockatrice_network_client INTERFACE .)
|
|||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client
|
||||
INTERFACE ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
|
||||
INTERFACE ${QT_MAIN_VERSION_STRING}::Network ${QT_MAIN_VERSION_STRING}::WebSockets
|
||||
libcockatrice_network_client_abstract libcockatrice_network_client_local
|
||||
libcockatrice_network_client_remote
|
||||
)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol li
|
|||
target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_abstract
|
||||
PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol
|
||||
libcockatrice_network_server_remote
|
||||
libcockatrice_network_client_abstract PUBLIC ${QT_MAIN_VERSION_STRING}::Network ${QT_MAIN_VERSION_STRING}::WebSockets
|
||||
libcockatrice_protocol libcockatrice_network_server_remote
|
||||
)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ add_dependencies(libcockatrice_network_client_local libcockatrice_network_client
|
|||
target_include_directories(libcockatrice_network_client_local PUBLIC .)
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local
|
||||
PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
|
||||
libcockatrice_network_client_abstract
|
||||
libcockatrice_network_client_local PUBLIC ${QT_MAIN_VERSION_STRING}::Network ${QT_MAIN_VERSION_STRING}::WebSockets
|
||||
libcockatrice_network_client_abstract
|
||||
)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ target_include_directories(libcockatrice_network_client_remote PUBLIC .)
|
|||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_remote
|
||||
PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
|
||||
libcockatrice_network_client_abstract libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
|
||||
PUBLIC ${QT_MAIN_VERSION_STRING}::Network ${QT_MAIN_VERSION_STRING}::WebSockets libcockatrice_network_client_abstract
|
||||
libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
|
||||
)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@ add_library(libcockatrice_network_server INTERFACE)
|
|||
target_include_directories(libcockatrice_network_server INTERFACE .)
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local
|
||||
libcockatrice_network_server INTERFACE ${QT_MODULES_COCKATRICE} libcockatrice_network_server_local
|
||||
libcockatrice_network_server_remote
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
|
|||
|
||||
target_include_directories(libcockatrice_network_server_local PUBLIC .)
|
||||
|
||||
target_link_libraries(libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol)
|
||||
target_link_libraries(libcockatrice_network_server_local PUBLIC ${QT_MODULES_COCKATRICE} libcockatrice_protocol)
|
||||
|
|
|
|||
|
|
@ -60,5 +60,5 @@ target_include_directories(libcockatrice_network_server_remote PUBLIC .)
|
|||
# Make cockatrice_server depend on cockatrice_protocol
|
||||
target_link_libraries(
|
||||
libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
|
||||
libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
|
||||
libcockatrice_deck_list ${QT_MODULES_COCKATRICE}
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue