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

Fix build with embedded protobuf library

Browse Source 
Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a
This commit is contained in:
poljvd
2014-12-20 13:15:20 +01:00
parent b50611fef7
commit a041941e7a
7 changed files with 140 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/CMakeLists.txt
View File

@@ -1,12 +1,15 @@
add_subdirectory(hyperiond)
add_subdirectory(hyperion-remote)
# Add the 'Video 4 Linux' grabber if it is enabled
if(ENABLE_V4L2)
add_subdirectory(hyperion-v4l2)
endif(ENABLE_V4L2)
# The following clients depend on the protobuf library
if(ENABLE_PROTOBUF)
# Add the 'Video 4 Linux' grabber if it is enabled
if(ENABLE_V4L2)
add_subdirectory(hyperion-v4l2)
endif()
# Add the X11 grabber if it is enabled
if(ENABLE_X11)
add_subdirectory(hyperion-x11)
endif(ENABLE_X11)
# Add the X11 grabber if it is enabled
if(ENABLE_X11)
add_subdirectory(hyperion-x11)
endif()
endif()

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

@@ -14,6 +14,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
${QT_INCLUDES}
${X11_INCLUDES}
${PROTOBUF_INCLUDE_DIRS}
)
set(Hyperion_X11_QT_HEADERS