Refactor V4L2 and X11 grabbers to share more code

Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
This commit is contained in:
poljvd
2014-11-21 21:24:33 +01:00
parent 01854a471e
commit d89f504d83
22 changed files with 724 additions and 748 deletions

View File

@@ -10,7 +10,9 @@ include_directories(
# Group the headers that go through the MOC compiler
set(ProtoServer_QT_HEADERS
${CURRENT_HEADER_DIR}/ProtoServer.h
${CURRENT_HEADER_DIR}/ProtoConnection.h
${CURRENT_SOURCE_DIR}/ProtoClientConnection.h
${CURRENT_HEADER_DIR}/ProtoConnectionWrapper.h
)
set(ProtoServer_HEADERS
@@ -19,6 +21,8 @@ set(ProtoServer_HEADERS
set(ProtoServer_SOURCES
${CURRENT_SOURCE_DIR}/ProtoServer.cpp
${CURRENT_SOURCE_DIR}/ProtoClientConnection.cpp
${CURRENT_SOURCE_DIR}/ProtoConnection.cpp
${CURRENT_SOURCE_DIR}/ProtoConnectionWrapper.cpp
)
set(ProtoServer_PROTOS
@@ -44,5 +48,5 @@ add_library(protoserver
target_link_libraries(protoserver
hyperion
hyperion-utils
${PROTOBUF_LIBRARIES}
${QT_LIBRARIES})
${PROTOBUF_LIBRARIES}
${QT_LIBRARIES})