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

cockatrice_protocol can forward generated pb headers as a target.

Browse source 
Took 13 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 21:15:15 +02:00
parent d946d6a3ec
commit 27c7e42f69
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/deck_list/CMakeLists.txt
View file

@ -27,7 +27,6 @@ add_library(cockatrice_deck_list STATIC
target_include_directories(cockatrice_deck_list target_include_directories(cockatrice_deck_list
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )
target_link_libraries(cockatrice_deck_list target_link_libraries(cockatrice_deck_list

6
libs/pb/CMakeLists.txt
View file

@ -169,7 +169,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
message(STATUS "Using Protobuf Legacy Mode") message(STATUS "Using Protobuf Legacy Mode")
include_directories(${PROTOBUF_INCLUDE_DIRS}) include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb")
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES} OUT_DIR ${PROTO_BINARY_DIR})
add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES})
@ -177,6 +178,7 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lpthread) set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lpthread)
endif(UNIX) endif(UNIX)
target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS}) target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS})
target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PUBLIC ${PROTO_BINARY_DIR})
# ubuntu uses an outdated package for protobuf, 3.1.0 is required # ubuntu uses an outdated package for protobuf, 3.1.0 is required
if(${Protobuf_VERSION} VERSION_LESS "3.1.0") if(${Protobuf_VERSION} VERSION_LESS "3.1.0")
@ -191,7 +193,7 @@ else()
add_library(cockatrice_protocol ${PROTO_FILES}) add_library(cockatrice_protocol ${PROTO_FILES})
target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf) target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf)
set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb") set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb")
target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PUBLIC ${PROTO_BINARY_DIR})
protobuf_generate( protobuf_generate(
TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}" TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"

1
libs/server/CMakeLists.txt
View file

@ -56,7 +56,6 @@ add_library(cockatrice_server STATIC
target_include_directories(cockatrice_server target_include_directories(cockatrice_server
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )
# Make cockatrice_server depend on cockatrice_protocol # Make cockatrice_server depend on cockatrice_protocol