From e52d73be5c284d3c4a957ca6dfb9123ad6e768fa Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Sun, 3 Mar 2024 12:12:40 +0100 Subject: [PATCH] Add Temperature adjustment - add missing cmake updates --- CMakeLists.txt | 29 ++++++++++++++++++++--------- libsrc/hyperion/CMakeLists.txt | 3 +++ libsrc/utils/CMakeLists.txt | 3 +++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7818a6f1..f9e83565 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ set(DEFAULT_USE_SYSTEM_QMDNS_LIBS OFF) set(DEFAULT_TESTS OFF) # Build Hyperion with a reduced set of functionality, overwrites other default values -set(DEFAULT_HYPERION_LIGHT OFF) +set(DEFAULT_HYPERION_LIGHT ON ) if(${CMAKE_SYSTEM} MATCHES "Linux") set(DEFAULT_FB ON) @@ -232,23 +232,34 @@ if(HYPERION_LIGHT) SET ( DEFAULT_OSX OFF ) SET ( DEFAULT_QT OFF ) SET ( DEFAULT_V4L2 OFF ) + SET ( DEFAULT_AUDIO OFF ) SET ( DEFAULT_X11 OFF ) SET ( DEFAULT_XCB OFF ) - SET ( DEFAULT_AUDIO OFF ) + # LED-Devices + SET ( DEFAULT_DEV_NETWORK OFF ) + SET ( DEFAULT_DEV_SERIAL OFF ) + SET ( DEFAULT_DEV_SPI OFF ) + SET ( DEFAULT_DEV_TINKERFORGE OFF ) + SET ( DEFAULT_DEV_USB_HID OFF ) + SET ( DEFAULT_DEV_WS281XPWM OFF ) # Disable Input Servers - set(DEFAULT_BOBLIGHT_SERVER OFF) - set(DEFAULT_CEC OFF) - set(DEFAULT_FLATBUF_SERVER OFF) - set(DEFAULT_PROTOBUF_SERVER OFF) + SET ( DEFAULT_BOBLIGHT_SERVER OFF ) + SET ( DEFAULT_CEC OFF ) + SET ( DEFAULT_FLATBUF_SERVER OFF ) + SET ( DEFAULT_PROTOBUF_SERVER OFF ) # Disable Output Connectors - set(DEFAULT_FORWARDER OFF) - set(DEFAULT_FLATBUF_CONNECT OFF) + SET ( DEFAULT_FORWARDER OFF ) + SET ( DEFAULT_FLATBUF_CONNECT OFF ) # Disable Services - set(DEFAULT_EFFECTENGINE OFF) + SET ( DEFAULT_EXPERIMENTAL OFF ) + SET ( DEFAULT_MDNS ON ) + SET ( DEFAULT_REMOTE_CTL OFF ) + SET ( DEFAULT_EFFECTENGINE OFF ) + endif() message(STATUS "Grabber options:") diff --git a/libsrc/hyperion/CMakeLists.txt b/libsrc/hyperion/CMakeLists.txt index b073dcf4..7c4264f9 100644 --- a/libsrc/hyperion/CMakeLists.txt +++ b/libsrc/hyperion/CMakeLists.txt @@ -39,6 +39,9 @@ add_library(hyperion # Led Color Transform ${CMAKE_SOURCE_DIR}/include/hyperion/MultiColorAdjustment.h ${CMAKE_SOURCE_DIR}/libsrc/hyperion/MultiColorAdjustment.cpp + ${CMAKE_SOURCE_DIR}/include/hyperion/ColorCorrection.h + ${CMAKE_SOURCE_DIR}/include/hyperion/MultiColorCorrection.h + ${CMAKE_SOURCE_DIR}/libsrc/hyperion/MultiColorCorrection.cpp # Priority Muxer ${CMAKE_SOURCE_DIR}/include/hyperion/PriorityMuxer.h ${CMAKE_SOURCE_DIR}/libsrc/hyperion/PriorityMuxer.cpp diff --git a/libsrc/utils/CMakeLists.txt b/libsrc/utils/CMakeLists.txt index b7d28eeb..f8dda631 100644 --- a/libsrc/utils/CMakeLists.txt +++ b/libsrc/utils/CMakeLists.txt @@ -57,11 +57,14 @@ add_library(hyperion-utils # Rgb single color adjustment/correction ${CMAKE_SOURCE_DIR}/include/utils/RgbChannelAdjustment.h ${CMAKE_SOURCE_DIR}/libsrc/utils/RgbChannelAdjustment.cpp + ${CMAKE_SOURCE_DIR}/include/utils/RgbChannelCorrection.h + ${CMAKE_SOURCE_DIR}/libsrc/utils/RgbChannelCorrection.cpp # Color conversion/transformation ${CMAKE_SOURCE_DIR}/include/utils/RgbToRgbw.h ${CMAKE_SOURCE_DIR}/libsrc/utils/RgbToRgbw.cpp ${CMAKE_SOURCE_DIR}/include/utils/RgbTransform.h ${CMAKE_SOURCE_DIR}/libsrc/utils/RgbTransform.cpp + ${CMAKE_SOURCE_DIR}/include/utils/KelvinToRgb.h # System info class ${CMAKE_SOURCE_DIR}/include/utils/SysInfo.h ${CMAKE_SOURCE_DIR}/libsrc/utils/SysInfo.cpp