jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adjust cmakelists.

Browse source 
Took 6 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 13:24:16 +02:00
parent 5414e3e3b5
commit c5bf87dfed
7 changed files with 31 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libcockatrice_network/CMakeLists.txt
View file

@ -2,30 +2,15 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS add_subdirectory(libcockatrice/client)
local_client.h
)
set(SOURCES
local_client.cpp
)
if (Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif ()
add_library( add_library(
libcockatrice_network_client_local STATIC libcockatrice_network INTERFACE
${MOC_SOURCES}
${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client
) )

26
libcockatrice_network/libcockatrice/client/CMakeLists.txt
View file

@ -2,30 +2,16 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS add_subdirectory(abstract)
abstract/abstract_client.h add_subdirectory(local)
) add_subdirectory(remote)
set(SOURCES
abstract/abstract_client.cpp
)
if (Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif ()
add_library( add_library(
libcockatrice_network_client STATIC libcockatrice_network_client INTERFACE
${MOC_SOURCES}
${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) target_include_directories(libcockatrice_network_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote
) )

12
libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt
View file

@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
local_client.h abstract_client.h
) )
set(SOURCES set(SOURCES
local_client.cpp abstract_client.cpp
) )
if (Qt6_FOUND) if (Qt6_FOUND)
@ -17,15 +17,13 @@ elseif (Qt5_FOUND)
endif () endif ()
add_library( add_library(
libcockatrice_network_client_local STATIC libcockatrice_network_client_abstract STATIC
${MOC_SOURCES} ${MOC_SOURCES}
${SOURCES} ${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) target_include_directories(libcockatrice_network_client_abstract PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES}
) )

2
libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp
View file

@ -1,4 +1,4 @@
#include "../../../cockatrice/src/server/abstract_client.h" #include "abstract_client.h"
#include "../../../../cockatrice/src/server/pending_command.h" #include "../../../../cockatrice/src/server/pending_command.h"

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

@ -22,10 +22,10 @@ add_library(
${SOURCES} ${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
) )

12
libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt
View file

@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
local_client.h remote_client.h
) )
set(SOURCES set(SOURCES
local_client.cpp remote_client.cpp
) )
if (Qt6_FOUND) if (Qt6_FOUND)
@ -17,15 +17,15 @@ elseif (Qt5_FOUND)
endif () endif ()
add_library( add_library(
libcockatrice_network_client_local STATIC libcockatrice_network_client_remote STATIC
${MOC_SOURCES} ${MOC_SOURCES}
${SOURCES} ${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract)
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network_client_remote PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
) )

14
libcockatrice_network/libcockatrice/server/local/CMakeLists.txt
View file

@ -3,11 +3,13 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
local_client.h local_server.h
local_server_interface.h
) )
set(SOURCES set(SOURCES
local_client.cpp local_server.cpp
local_server_interface.cpp
) )
if (Qt6_FOUND) if (Qt6_FOUND)
@ -17,15 +19,13 @@ elseif (Qt5_FOUND)
endif () endif ()
add_library( add_library(
libcockatrice_network_client_local STATIC libcockatrice_network_server_local STATIC
${MOC_SOURCES} ${MOC_SOURCES}
${SOURCES} ${SOURCES}
) )
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) target_include_directories(libcockatrice_network_server_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES}
) )