Skip to content
GitLab
Commit 65d4c77e authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

cmake fix

parent 89b8fe1e
Hide whitespace changes
Inline Side-by-side
common/pb/CMakeLists.txt
View file @ 65d4c77e
...@@ -140,6 +140,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ...@@ -140,6 +140,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES})
if (WIN32) if (WIN32)
set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lprotobuf) set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lprotobuf)
endif (WIN32) endif (WIN32)
......
servatrice/CMakeLists.txt
View file @ 65d4c77e
...@@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common) ...@@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC}) ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC})
TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${PROTOBUF_LIBRARIES} ${LIBGCRYPT_LIBRARY}) TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY})
#add_custom_target(versionheader ALL DEPENDS version_header) #add_custom_target(versionheader ALL DEPENDS version_header)
add_custom_command( add_custom_command(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment