frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor V4L2 and X11 grabbers to share more code

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

23
src/hyperion-x11/CMakeLists.txt
View File

@@ -4,9 +4,6 @@ cmake_minimum_required(VERSION 2.8)
# Set the project name
project(hyperion-x11)
# add protocol buffers
find_package(Protobuf REQUIRED)
# find Qt4
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
@@ -14,42 +11,27 @@ find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
find_package(X11 REQUIRED)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${PROTOBUF_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${X11_INCLUDES}
)
set(Hyperion_X11_QT_HEADERS
ProtoWrapper.h
X11Wrapper.h)
set(Hyperion_X11_HEADERS
X11Grabber.h
../hyperion-v4l2/ProtoConnection.h
)
set(Hyperion_X11_SOURCES
hyperion-x11.cpp
ProtoWrapper.cpp
X11Grabber.cpp
X11Wrapper.cpp
../hyperion-v4l2/ProtoConnection.cpp
)
set(Hyperion_X11_PROTOS
${CMAKE_CURRENT_SOURCE_DIR}/../../libsrc/protoserver/message.proto
)
QT4_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS})
protobuf_generate_cpp(Hyperion_X11_PROTO_SRCS Hyperion_X11_PROTO_HDRS ${Hyperion_X11_PROTOS})
add_executable(hyperion-x11
${Hyperion_X11_HEADERS}
${Hyperion_X11_SOURCES}
${Hyperion_X11_PROTO_SRCS}
${Hyperion_X11_PROTO_HDRS}
${Hyperion_X11_HEADERS_MOC}
)
@@ -57,7 +39,8 @@ target_link_libraries(hyperion-x11
getoptPlusPlus
blackborder
hyperion-utils
${PROTOBUF_LIBRARIES}
protoserver
x11-grabber
${X11_LIBRARIES}
pthread
)