Skip to content

Commit 6ec9d9f

Browse files
committed
CCache handling
1 parent c661ae7 commit 6ec9d9f

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

Diff for: .ci/ci_build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
108108
make -j $(nproc) package || exit 3 &&
109109
cp /hyperhdr/build/bin/h* /deploy/ 2>/dev/null || : &&
110110
cp /hyperhdr/build/Hyper* /deploy/ 2>/dev/null || : &&
111+
ccache -s &&
111112
exit 0;
112113
exit 1 " || { echo "---> HyperHDR compilation failed! Abort"; exit 5; }
113114
ls -a .ccache

Diff for: CMakeLists.txt

+30-28
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,36 @@ set(CMAKE_AUTORCC ON)
1717

1818
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1919

20+
# Set build variables
21+
SET ( DEFAULT_PROTOBUF ON )
22+
SET ( DEFAULT_BOBLIGHT ON )
23+
SET ( DEFAULT_WS281XPWM OFF )
24+
SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS OFF )
25+
SET ( DEFAULT_USE_SYSTEM_MBEDTLS_LIBS OFF )
26+
SET ( DEFAULT_MF OFF )
27+
SET ( DEFAULT_DX OFF )
28+
SET ( DEFAULT_AVF OFF )
29+
SET ( DEFAULT_MAC_SYSTEM OFF )
30+
SET ( DEFAULT_V4L2 OFF )
31+
SET ( DEFAULT_X11 OFF )
32+
SET ( DEFAULT_PIPEWIRE OFF )
33+
SET ( DEFAULT_FRAMEBUFFER OFF )
34+
SET ( DEFAULT_SOUNDCAPWINDOWS OFF )
35+
SET ( DEFAULT_SOUNDCAPMACOS OFF )
36+
SET ( DEFAULT_CEC OFF )
37+
SET ( DEFAULT_BONJOUR ON )
38+
SET ( DEFAULT_MQTT ON )
39+
SET ( DEFAULT_STATIC_QT_PLUGINS OFF )
40+
SET ( DEFAULT_PRECOMPILED_HEADERS ON )
41+
2042
# Configure CCache if available
2143
find_program(CCACHE_FOUND ccache)
2244
if ( CCACHE_FOUND )
2345
if (DEFINED ENV{CCACHE_DIR})
24-
message ( STATUS "Found CCache and its env settings: $ENV{CCACHE_DIR}. Will try to use it." )
46+
message ( STATUS "Found CCache and its env settings: $ENV{CCACHE_DIR}. Will try to use it. Disabling precompiled headers." )
2547
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
2648
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
49+
SET ( DEFAULT_PRECOMPILED_HEADERS OFF )
2750
else()
2851
message ( WARNING "Found CCache but env settings: CCACHE_DIR is not set. Skipping." )
2952
endif()
@@ -52,30 +75,6 @@ ELSE()
5275
SET( Qt_VERSION 5 )
5376
ENDIF()
5477

55-
56-
# Set build variables
57-
SET ( DO_NOT_USE_QT_VERSION_6_LIBS OFF )
58-
SET ( USE_PRECOMPILED_HEADERS ON )
59-
SET ( DEFAULT_PROTOBUF ON )
60-
SET ( DEFAULT_BOBLIGHT ON )
61-
SET ( DEFAULT_WS281XPWM OFF )
62-
SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS OFF )
63-
SET ( DEFAULT_USE_SYSTEM_MBEDTLS_LIBS OFF )
64-
SET ( DEFAULT_MF OFF )
65-
SET ( DEFAULT_DX OFF )
66-
SET ( DEFAULT_AVF OFF )
67-
SET ( DEFAULT_MAC_SYSTEM OFF )
68-
SET ( DEFAULT_V4L2 OFF )
69-
SET ( DEFAULT_X11 OFF )
70-
SET ( DEFAULT_PIPEWIRE OFF )
71-
SET ( DEFAULT_FRAMEBUFFER OFF )
72-
SET ( DEFAULT_SOUNDCAPWINDOWS OFF )
73-
SET ( DEFAULT_SOUNDCAPMACOS OFF )
74-
SET ( DEFAULT_CEC OFF )
75-
SET ( DEFAULT_BONJOUR ON )
76-
SET ( DEFAULT_MQTT ON )
77-
SET ( DEFAULT_STATIC_QT_PLUGINS OFF )
78-
7978
IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )
8079
SET ( DEFAULT_SOUNDCAPLINUX ON )
8180
SET ( DEFAULT_V4L2 ON )
@@ -150,9 +149,9 @@ if ( "${PLATFORM}" MATCHES "osx" )
150149
list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
151150
endif()
152151

153-
SET ( DEFAULT_AVF ON )
154-
SET ( DEFAULT_MAC_SYSTEM ON )
155-
SET ( USE_PRECOMPILED_HEADERS OFF )
152+
SET ( DEFAULT_AVF ON )
153+
SET ( DEFAULT_MAC_SYSTEM ON )
154+
SET ( DEFAULT_PRECOMPILED_HEADERS OFF )
156155
elseif ( "${PLATFORM}" MATCHES "rpi" )
157156
SET ( DEFAULT_WS281XPWM ON )
158157
SET ( DEFAULT_CEC ON )
@@ -359,6 +358,9 @@ message(STATUS "ENABLE_MQTT = ${ENABLE_MQTT}")
359358
option(USE_STATIC_QT_PLUGINS "Enable static QT plugins" ${DEFAULT_STATIC_QT_PLUGINS})
360359
message(STATUS "USE_STATIC_QT_PLUGINS = ${USE_STATIC_QT_PLUGINS}")
361360

361+
option(USE_PRECOMPILED_HEADERS "Enable precompiled headers (PCH)" ${DEFAULT_PRECOMPILED_HEADERS})
362+
message(STATUS "USE_PRECOMPILED_HEADERS = ${USE_PRECOMPILED_HEADERS}")
363+
362364
SET ( FLATBUFFERS_INSTALL_BIN_DIR ${CMAKE_BINARY_DIR}/flatbuf )
363365
SET ( FLATBUFFERS_INSTALL_LIB_DIR ${CMAKE_BINARY_DIR}/flatbuf )
364366

Diff for: cmake/packages.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if ( ENABLE_CEC )
6969
endif()
7070
SET ( CPACK_DEBIAN_PACKAGE_SUGGESTS "libx11-6" )
7171
SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )
72-
SET ( CPACK_DEBIAN_COMPRESSION_TYPE "xz" )
72+
SET ( CPACK_DEBIAN_COMPRESSION_TYPE "gzip" )
7373

7474
# .rpm for rpm
7575
# https://cmake.org/cmake/help/v3.5/module/CPackRPM.html

Diff for: sources/leddevice/dev_net/LedDevicePhilipsHue.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <QDateTime>
1212
#include <chrono>
13+
#include <cmath>
1314

1415
// Constants
1516
namespace {

0 commit comments

Comments
 (0)