mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Allow disabling PROTOBUF support
One dependency less for users that only use DISPMANX grabbing Former-commit-id: 24ea0480e3798bab692e75d82ddb9f5eccfa03c5
This commit is contained in:
parent
265656cc35
commit
3c65b82ac1
@ -19,6 +19,13 @@ message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
|
|||||||
option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
|
option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
|
||||||
message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
|
message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
|
||||||
|
|
||||||
|
option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
|
||||||
|
message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
|
||||||
|
|
||||||
|
if (ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
|
||||||
|
message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
|
||||||
|
endif (ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
|
||||||
|
|
||||||
# Createt the configuration file
|
# Createt the configuration file
|
||||||
# configure a header file to pass some of the CMake settings
|
# configure a header file to pass some of the CMake settings
|
||||||
# to the source code
|
# to the source code
|
||||||
@ -54,12 +61,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
|
|||||||
# Configure the use of QT4
|
# Configure the use of QT4
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
|
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
|
||||||
|
|
||||||
# add protocol buffers (make sure to find the static version)
|
if (ENABLE_PROTOBUF)
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
# add protocol buffers (make sure to find the static version)
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
find_package(Protobuf REQUIRED)
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD})
|
find_package(Protobuf REQUIRED)
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_OLD})
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES_OLD)
|
||||||
|
endif (ENABLE_PROTOBUF)
|
||||||
|
|
||||||
#add libusb and pthreads
|
#add libusb and pthreads
|
||||||
find_package(libusb-1.0 REQUIRED)
|
find_package(libusb-1.0 REQUIRED)
|
||||||
|
@ -11,3 +11,6 @@
|
|||||||
|
|
||||||
// Define to enable the spi-device
|
// Define to enable the spi-device
|
||||||
#cmakedefine ENABLE_TINKERFORGE
|
#cmakedefine ENABLE_TINKERFORGE
|
||||||
|
|
||||||
|
// Define to enable PROTOBUF server
|
||||||
|
#cmakedefine ENABLE_PROTOBUF
|
||||||
|
@ -6,7 +6,11 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc)
|
|||||||
add_subdirectory(hyperion)
|
add_subdirectory(hyperion)
|
||||||
add_subdirectory(blackborder)
|
add_subdirectory(blackborder)
|
||||||
add_subdirectory(jsonserver)
|
add_subdirectory(jsonserver)
|
||||||
add_subdirectory(protoserver)
|
|
||||||
|
if (ENABLE_PROTOBUF)
|
||||||
|
add_subdirectory(protoserver)
|
||||||
|
endif (ENABLE_PROTOBUF)
|
||||||
|
|
||||||
add_subdirectory(boblightserver)
|
add_subdirectory(boblightserver)
|
||||||
add_subdirectory(leddevice)
|
add_subdirectory(leddevice)
|
||||||
add_subdirectory(utils)
|
add_subdirectory(utils)
|
||||||
|
@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 2.8)
|
|||||||
|
|
||||||
project(hyperion-remote)
|
project(hyperion-remote)
|
||||||
|
|
||||||
# add protocol buffers
|
|
||||||
find_package(Protobuf REQUIRED)
|
|
||||||
|
|
||||||
# find Qt4
|
# find Qt4
|
||||||
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
|
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ target_link_libraries(hyperiond
|
|||||||
xbmcvideochecker
|
xbmcvideochecker
|
||||||
effectengine
|
effectengine
|
||||||
jsonserver
|
jsonserver
|
||||||
protoserver
|
|
||||||
boblightserver
|
boblightserver
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -18,3 +17,7 @@ endif (ENABLE_DISPMANX)
|
|||||||
if (ENABLE_V4L2)
|
if (ENABLE_V4L2)
|
||||||
target_link_libraries(hyperiond v4l2-grabber)
|
target_link_libraries(hyperiond v4l2-grabber)
|
||||||
endif (ENABLE_V4L2)
|
endif (ENABLE_V4L2)
|
||||||
|
|
||||||
|
if (ENABLE_PROTOBUF)
|
||||||
|
target_link_libraries(hyperiond protoserver)
|
||||||
|
endif (ENABLE_PROTOBUF)
|
||||||
|
@ -36,8 +36,10 @@
|
|||||||
// JsonServer includes
|
// JsonServer includes
|
||||||
#include <jsonserver/JsonServer.h>
|
#include <jsonserver/JsonServer.h>
|
||||||
|
|
||||||
|
#ifdef ENABLE_PROTOBUF
|
||||||
// ProtoServer includes
|
// ProtoServer includes
|
||||||
#include <protoserver/ProtoServer.h>
|
#include <protoserver/ProtoServer.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
// BoblightServer includes
|
// BoblightServer includes
|
||||||
#include <boblightserver/BoblightServer.h>
|
#include <boblightserver/BoblightServer.h>
|
||||||
@ -233,6 +235,7 @@ int main(int argc, char** argv)
|
|||||||
std::cout << "Json server created and started on port " << jsonServer->getPort() << std::endl;
|
std::cout << "Json server created and started on port " << jsonServer->getPort() << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ENABLE_PROTOBUF
|
||||||
// Create Proto server if configuration is present
|
// Create Proto server if configuration is present
|
||||||
ProtoServer * protoServer = nullptr;
|
ProtoServer * protoServer = nullptr;
|
||||||
if (config.isMember("protoServer"))
|
if (config.isMember("protoServer"))
|
||||||
@ -241,6 +244,7 @@ int main(int argc, char** argv)
|
|||||||
protoServer = new ProtoServer(&hyperion, protoServerConfig["port"].asUInt());
|
protoServer = new ProtoServer(&hyperion, protoServerConfig["port"].asUInt());
|
||||||
std::cout << "Proto server created and started on port " << protoServer->getPort() << std::endl;
|
std::cout << "Proto server created and started on port " << protoServer->getPort() << std::endl;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Create Boblight server if configuration is present
|
// Create Boblight server if configuration is present
|
||||||
BoblightServer * boblightServer = nullptr;
|
BoblightServer * boblightServer = nullptr;
|
||||||
@ -264,7 +268,9 @@ int main(int argc, char** argv)
|
|||||||
#endif
|
#endif
|
||||||
delete xbmcVideoChecker;
|
delete xbmcVideoChecker;
|
||||||
delete jsonServer;
|
delete jsonServer;
|
||||||
|
#ifdef ENABLE_PROTOBUF
|
||||||
delete protoServer;
|
delete protoServer;
|
||||||
|
#endif
|
||||||
delete boblightServer;
|
delete boblightServer;
|
||||||
|
|
||||||
// leave application
|
// leave application
|
||||||
|
Loading…
Reference in New Issue
Block a user