mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Refactor/Create APT/DNF Repository (#1648)
This commit is contained in:
@@ -1,25 +1,10 @@
|
||||
cmake_minimum_required(VERSION 3.5.0)
|
||||
project(hyperion-v4l2)
|
||||
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/flatbufserver
|
||||
${FLATBUFFERS_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(Hyperion_V4L2_HEADERS
|
||||
ScreenshotHandler.h
|
||||
)
|
||||
|
||||
set(Hyperion_V4L2_SOURCES
|
||||
hyperion-v4l2.cpp
|
||||
ScreenshotHandler.cpp
|
||||
)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
${Hyperion_V4L2_HEADERS}
|
||||
${Hyperion_V4L2_SOURCES}
|
||||
ScreenshotHandler.h
|
||||
ScreenshotHandler.cpp
|
||||
hyperion-v4l2.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
@@ -28,27 +13,23 @@ target_link_libraries(${PROJECT_NAME}
|
||||
hyperion-utils
|
||||
flatbufconnect
|
||||
flatbuffers
|
||||
Qt${QT_VERSION_MAJOR}::Core
|
||||
Qt${QT_VERSION_MAJOR}::Network
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
)
|
||||
|
||||
if(ENABLE_MDNS)
|
||||
target_link_libraries(${PROJECT_NAME} mdns)
|
||||
target_link_libraries(${PROJECT_NAME} mdns)
|
||||
else()
|
||||
target_link_libraries(${PROJECT_NAME} ssdp)
|
||||
target_link_libraries(${PROJECT_NAME} ssdp)
|
||||
endif()
|
||||
|
||||
if (ENABLE_AMLOGIC)
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
pcre16 dl z
|
||||
)
|
||||
if(ENABLE_AMLOGIC)
|
||||
target_link_libraries(${PROJECT_NAME} pcre16 dl z)
|
||||
endif()
|
||||
|
||||
install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "hyperion_v4l2" )
|
||||
install (TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "hyperion_v4l2")
|
||||
|
||||
if(CMAKE_HOST_UNIX)
|
||||
install(CODE "EXECUTE_PROCESS(COMMAND ln -sf \"../share/hyperion/bin/${PROJECT_NAME}\" \"${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}\" )" COMPONENT "hyperion_v4l2" )
|
||||
install(FILES "${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}" DESTINATION "bin" RENAME "${PROJECT_NAME}" COMPONENT "hyperion_v4l2" )
|
||||
install(CODE "FILE (REMOVE ${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME} )" COMPONENT "hyperion_v4l2" )
|
||||
install(CODE "execute_process(COMMAND ln -sf \"../share/hyperion/bin/${PROJECT_NAME}\" \"${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}\")" COMPONENT "hyperion_v4l2")
|
||||
install(FILES "${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}" DESTINATION "bin" RENAME "${PROJECT_NAME}" COMPONENT "hyperion_v4l2")
|
||||
install(CODE "file (REMOVE ${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME})" COMPONENT "hyperion_v4l2")
|
||||
endif(CMAKE_HOST_UNIX)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <blackborder/BlackBorderProcessor.h>
|
||||
|
||||
// grabber includes
|
||||
#include "grabber/V4L2Grabber.h"
|
||||
#include "grabber/video/v4l2/V4L2Grabber.h"
|
||||
|
||||
// flatbuf includes
|
||||
#include <flatbufserver/FlatBufferConnection.h>
|
||||
@@ -255,7 +255,7 @@ int main(int argc, char** argv)
|
||||
SSDPDiscover discover;
|
||||
host = discover.getFirstService(searchType::STY_FLATBUFSERVER);
|
||||
#endif
|
||||
|
||||
|
||||
QHostAddress address;
|
||||
if (!NetUtils::resolveHostToAddress(log, host, address, port))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user