Support for precompiled headers (awawa-dev#359)

chbartsch · Nov 29, 2022 · bae4f21 · bae4f21
1 parent 2b62659
commit bae4f21
Show file tree

Hide file tree

Showing 63 changed files with 229 additions and 47 deletions.
diff --git a/.ci/ci_build.sh b/.ci/ci_build.sh
@@ -108,6 +108,7 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
 		make -j $(nproc) package || exit 3 &&
 		cp /hyperhdr/build/bin/h* /deploy/ 2>/dev/null || : &&
 		cp /hyperhdr/build/Hyper* /deploy/ 2>/dev/null || : &&
+		ccache -s &&
 		exit 0;
 		exit 1 " || { echo "---> HyperHDR compilation failed! Abort"; exit 5; }
 		ls -a .ccache

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,13 +17,36 @@ set(CMAKE_AUTORCC ON)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# Set build variables
+SET ( DEFAULT_PROTOBUF                    ON  )
+SET ( DEFAULT_BOBLIGHT                    ON  )
+SET ( DEFAULT_WS281XPWM                   OFF )
+SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS OFF )
+SET ( DEFAULT_USE_SYSTEM_MBEDTLS_LIBS     OFF )
+SET ( DEFAULT_MF                          OFF )
+SET ( DEFAULT_DX                          OFF )
+SET ( DEFAULT_AVF                         OFF )
+SET ( DEFAULT_MAC_SYSTEM                  OFF )
+SET ( DEFAULT_V4L2                        OFF )
+SET ( DEFAULT_X11                         OFF )
+SET ( DEFAULT_PIPEWIRE                    OFF )
+SET ( DEFAULT_FRAMEBUFFER                 OFF )
+SET ( DEFAULT_SOUNDCAPWINDOWS             OFF )
+SET ( DEFAULT_SOUNDCAPMACOS               OFF )
+SET ( DEFAULT_CEC                         OFF )
+SET ( DEFAULT_BONJOUR                     ON  )
+SET ( DEFAULT_MQTT                        ON  )
+SET ( DEFAULT_STATIC_QT_PLUGINS           OFF )
+SET ( DEFAULT_PRECOMPILED_HEADERS         ON  )
+
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)
 if ( CCACHE_FOUND )
 	if (DEFINED ENV{CCACHE_DIR})
-		message ( STATUS "Found CCache and its env settings: $ENV{CCACHE_DIR}. Will try to use it." )
+		message ( STATUS "Found CCache and its env settings: $ENV{CCACHE_DIR}. Will try to use it. Disabling precompiled headers." )
 		set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 		set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+		SET ( DEFAULT_PRECOMPILED_HEADERS OFF )
 	else()
 		message ( WARNING "Found CCache but env settings: CCACHE_DIR is not set. Skipping." )
 	endif()
@@ -52,29 +75,6 @@ ELSE()
 	SET( Qt_VERSION 5 )	
 ENDIF()
 
-
-# Set build variables
-SET ( DO_NOT_USE_QT_VERSION_6_LIBS        OFF )
-SET ( DEFAULT_PROTOBUF                    ON  )
-SET ( DEFAULT_BOBLIGHT                    ON  )
-SET ( DEFAULT_WS281XPWM                   OFF )
-SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS OFF )
-SET ( DEFAULT_USE_SYSTEM_MBEDTLS_LIBS     OFF )
-SET ( DEFAULT_MF                          OFF )
-SET ( DEFAULT_DX                          OFF )
-SET ( DEFAULT_AVF                         OFF )
-SET ( DEFAULT_MAC_SYSTEM                  OFF )
-SET ( DEFAULT_V4L2                        OFF )
-SET ( DEFAULT_X11                         OFF )
-SET ( DEFAULT_PIPEWIRE                    OFF )
-SET ( DEFAULT_FRAMEBUFFER                 OFF )
-SET ( DEFAULT_SOUNDCAPWINDOWS             OFF )
-SET ( DEFAULT_SOUNDCAPMACOS               OFF )
-SET ( DEFAULT_CEC                         OFF )
-SET ( DEFAULT_BONJOUR                     ON  )
-SET ( DEFAULT_MQTT                        ON  )
-SET ( DEFAULT_STATIC_QT_PLUGINS           OFF )
-
 IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )	
 	SET ( DEFAULT_SOUNDCAPLINUX ON )
 	SET ( DEFAULT_V4L2          ON )
@@ -149,8 +149,9 @@ if ( "${PLATFORM}" MATCHES "osx" )
 		list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
 	endif()
 
-	SET ( DEFAULT_AVF        ON  )
-	SET ( DEFAULT_MAC_SYSTEM ON  )
+	SET ( DEFAULT_AVF                 ON  )
+	SET ( DEFAULT_MAC_SYSTEM          ON  )
+	SET ( DEFAULT_PRECOMPILED_HEADERS OFF )
 elseif ( "${PLATFORM}" MATCHES "rpi" )	
 	SET ( DEFAULT_WS281XPWM  ON )
 	SET ( DEFAULT_CEC        ON )
@@ -357,6 +358,9 @@ message(STATUS "ENABLE_MQTT = ${ENABLE_MQTT}")
 option(USE_STATIC_QT_PLUGINS "Enable static QT plugins" ${DEFAULT_STATIC_QT_PLUGINS})
 message(STATUS "USE_STATIC_QT_PLUGINS = ${USE_STATIC_QT_PLUGINS}")
 
+option(USE_PRECOMPILED_HEADERS "Enable precompiled headers (PCH)" ${DEFAULT_PRECOMPILED_HEADERS})
+message(STATUS "USE_PRECOMPILED_HEADERS = ${USE_PRECOMPILED_HEADERS}")
+
 SET ( FLATBUFFERS_INSTALL_BIN_DIR ${CMAKE_BINARY_DIR}/flatbuf )
 SET ( FLATBUFFERS_INSTALL_LIB_DIR ${CMAKE_BINARY_DIR}/flatbuf )
 
@@ -453,6 +457,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 	endif()
 
 	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT hyperhdr)
+	add_definitions(/MP)
 endif()
 
 add_definitions(${QT_DEFINITIONS})
@@ -542,8 +547,8 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_D
 include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/packages.cmake)
 
 # external targets
-if (WIN32 AND TARGET apidoc AND TARGET flatbuffers AND TARGET flatc AND TARGET mbedcrypto AND TARGET qmqtt)
-	set_target_properties(qmqtt apidoc flatbuffers flatc flathash lib mbedcrypto mbedtls mbedx509 resources uninstall PROPERTIES FOLDER ExternalLibsTargets)	
+if (WIN32 AND TARGET precompiled_hyperhdr_headers AND TARGET apidoc AND TARGET flatbuffers AND TARGET flatc AND TARGET mbedcrypto AND TARGET qmqtt)
+	set_target_properties(precompiled_hyperhdr_headers qmqtt apidoc flatbuffers flatc flathash lib mbedcrypto mbedtls mbedx509 resources uninstall PROPERTIES FOLDER ExternalLibsTargets)	
 else()
 	set_target_properties(resources uninstall PROPERTIES FOLDER ExternalLibsTargets)
 endif()

diff --git a/assets/webconfig/content/connection_lost.html b/assets/webconfig/content/connection_lost.html
@@ -30,7 +30,7 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 	var connectionTimer;
 	var animationTimer;
 	var count = 1;
-	var reconnectInterval = 4000;
+	var reconnectInterval = 2000;
 	var connURL = window.location.protocol + "//" + window.location.hostname + ":" + window.jsonPort + window.location.pathname + window.location.hash;
 	var animation = -1;
 	var animation_value = 0;
@@ -91,7 +91,7 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 		$.ajax({ url: connURL })
 			.done(function (data) {
 				window.clearInterval(connectionTimer);
-				if (reconnectInterval <= 2000) {
+				if (reconnectInterval < 2000) {
 					let url = connURL;
 					if (window.connURL.includes("#")) url = window.connURL.slice(0, window.connURL.indexOf("#"));
 					window.location.replace(url);
@@ -110,7 +110,7 @@ <h4 class="reconstop" data-i18n="info_conlost_label_autorecon">We reconnect agai
 			// if we changed the webui port we connect faster
 			if (window.fastReconnect) {
 				window.fastReconnect = false;
-				reconnectInterval = 2000;
+				reconnectInterval = 1000;
 			}
 			connectionTimer = window.setInterval(tryReconnect, reconnectInterval);
 			animationTimer = window.setInterval(animate, 100);

diff --git a/include/base/AllHeaders_pch.h b/include/base/AllHeaders_pch.h
@@ -0,0 +1,82 @@
+#ifndef ALLHEADERS_PCH_H_
+#define ALLHEADERS_PCH_H_
+
+#include <QAtomicInteger>
+#include <QBuffer>
+#include <QByteArray>
+#include <QColor>
+#include <QCoreApplication>
+#include <QCryptographicHash>
+#include <QDateTime>
+#include <QExplicitlySharedDataPointer>
+#include <QFile>
+#include <QHostAddress>
+#include <QHostInfo>
+#include <QImage>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QList>
+#include <QMap>
+#include <QMultiMap>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QPair>
+#include <QPainter>
+#include <QRectF>
+#include <QRegularExpression>
+#include <QResource>
+#include <QSet>
+#include <QSize>
+#include <QSocketNotifier>
+#include <QStack>
+#include <QString>
+#include <QStringList>
+#include <QSemaphore>
+#include <QSharedData>
+#include <QQueue>
+#include <QTcpSocket>
+#include <QTimer>
+#include <QTextStream>
+#include <QThread>
+#include <QThreadStorage>
+#include <QUdpSocket>
+#include <QUuid>
+#include <QVariant>
+#include <QVector>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QStringView>
+#else
+#include <QStringRef>
+#endif
+
+#include <algorithm>
+#include <atomic>
+#include <cassert>
+#include <chrono>
+#include <cmath>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+#include <exception>
+#include <functional>
+#include <iterator>
+#include <inttypes.h>
+#include <iostream>
+#include <limits>
+#include <list>
+#include <stdexcept>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <sstream>
+#include <map>
+#include <math.h>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+
+#endif // ALLHEADERS_PCH_H_
diff --git a/include/base/SoundCapture.h b/include/base/SoundCapture.h
@@ -1,14 +1,12 @@
 #pragma once
 
-
-#include <utils/Logger.h>
-#include <utils/settings.h>
 #include <QString>
 #include <QSemaphore>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QColor>
 #include <effectengine/AnimationBaseMusic.h>
+#include <utils/settings.h>
 
 #define SOUNDCAP_N_WAVE      1024
 #define SOUNDCAP_LOG2_N_WAVE 10

diff --git a/include/db/DBManager.h b/include/db/DBManager.h
@@ -9,7 +9,6 @@
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QUuid>
-#include <QNetworkInterface>
 #include <QJsonDocument>
 #include <QThreadStorage>
 

diff --git a/include/effectengine/AnimationBase.h b/include/effectengine/AnimationBase.h
@@ -1,12 +1,6 @@
 #pragma once
 
-#include <QDateTime>
-#include <QSize>
-#include <QImage>
 #include <QPainter>
-#include <QJsonObject>
-#include <QList>
-
 #include <utils/Image.h>
 #include <effectengine/EffectDefinition.h>
 #include <utils/ColorSys.h>

diff --git a/include/effectengine/AnimationBaseMusic.h b/include/effectengine/AnimationBaseMusic.h
@@ -42,4 +42,3 @@ class AnimationBaseMusic : public AnimationBase
 
 };
 
-#include <base/SoundCapture.h>
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
@@ -1,3 +1,10 @@
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/precompiled_hyperhdr_headers.cpp "void precompiledHeadersHyperHDR(){};")
+	add_library(precompiled_hyperhdr_headers ${CMAKE_CURRENT_BINARY_DIR}/precompiled_hyperhdr_headers.cpp)
+	target_link_libraries(precompiled_hyperhdr_headers Qt${Qt_VERSION}::Gui Qt${Qt_VERSION}::Network)
+
+    target_precompile_headers(precompiled_hyperhdr_headers PRIVATE ${CMAKE_SOURCE_DIR}/include/base/AllHeaders_pch.h)
+endif()
 
 # Define the current source locations
 SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include)

diff --git a/sources/api/CMakeLists.txt b/sources/api/CMakeLists.txt
@@ -19,3 +19,7 @@ target_link_libraries(hyperhdr-api
 	Qt${Qt_VERSION}::Gui
 	Qt${Qt_VERSION}::Network
 )
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(hyperhdr-api REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/base/CMakeLists.txt b/sources/base/CMakeLists.txt
@@ -34,3 +34,7 @@ endif()
 if (ENABLE_BONJOUR)
 	target_link_libraries(hyperhdr-base bonjour)
 endif ()
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(hyperhdr-base REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/base/SoundCapture.cpp b/sources/base/SoundCapture.cpp
@@ -29,6 +29,7 @@
 #include <utils/settings.h>
 #include <utils/Logger.h>
 #include <cmath>
+
 uint32_t	  SoundCapture::_noSoundCounter = 0;
 bool		  SoundCapture::_noSoundWarning = false;
 bool		  SoundCapture::_soundDetectedInfo = false;

diff --git a/sources/blackborder/CMakeLists.txt b/sources/blackborder/CMakeLists.txt
@@ -11,3 +11,7 @@ target_link_libraries(blackborder
  	hyperhdr-utils
 	hyperhdr-base
 )
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(blackborder REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/boblightserver/CMakeLists.txt b/sources/boblightserver/CMakeLists.txt
@@ -12,3 +12,8 @@ target_link_libraries(boblightserver
 	hyperhdr-utils
 	${QT_LIBRARIES}
 )
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(boblightserver REUSE_FROM precompiled_hyperhdr_headers)
+endif()
+
diff --git a/sources/bonjour/CMakeLists.txt b/sources/bonjour/CMakeLists.txt
@@ -14,3 +14,7 @@ target_link_libraries(bonjour
 		hyperhdr-utils
 		Qt${Qt_VERSION}::Network
 )
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(bonjour REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/commandline/CMakeLists.txt b/sources/commandline/CMakeLists.txt
@@ -10,3 +10,7 @@ target_link_libraries(commandline
 	hyperhdr-base
 	Qt${Qt_VERSION}::Gui
 )
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(commandline REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/db/CMakeLists.txt b/sources/db/CMakeLists.txt
@@ -18,3 +18,7 @@ target_link_libraries(database
 if (USE_STATIC_QT_PLUGINS)
 	target_link_libraries(database ${STATIC_QT_PLUGINS_LIBS})
 endif()
+
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
+    target_precompile_headers(database REUSE_FROM precompiled_hyperhdr_headers)
+endif()
diff --git a/sources/db/MetaTable.cpp b/sources/db/MetaTable.cpp
@@ -1,4 +1,5 @@
 #include <db/MetaTable.h>
+#include <QNetworkInterface>
 
 
 MetaTable::MetaTable(QObject* parent, bool readonlyMode)

diff --git a/sources/effectengine/Animation4Music_PulseBlue.cpp b/sources/effectengine/Animation4Music_PulseBlue.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseBlue.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseBlue::Animation4Music_PulseBlue() :
 	AnimationBaseMusic(AMUSIC_PULSEBLUE),

diff --git a/sources/effectengine/Animation4Music_PulseGreen.cpp b/sources/effectengine/Animation4Music_PulseGreen.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseGreen.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseGreen::Animation4Music_PulseGreen() :
 	AnimationBaseMusic(AMUSIC_PULSEGREEN),

diff --git a/sources/effectengine/Animation4Music_PulseMulti.cpp b/sources/effectengine/Animation4Music_PulseMulti.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseMulti.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseMulti::Animation4Music_PulseMulti() :
 	AnimationBaseMusic(AMUSIC_PULSEMULTI),

diff --git a/sources/effectengine/Animation4Music_PulseMultiFast.cpp b/sources/effectengine/Animation4Music_PulseMultiFast.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseMultiFast.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseMultiFast::Animation4Music_PulseMultiFast() :
 	AnimationBaseMusic(AMUSIC_PULSEMULTIFAST),

diff --git a/sources/effectengine/Animation4Music_PulseMultiSlow.cpp b/sources/effectengine/Animation4Music_PulseMultiSlow.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseMultiSlow.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseMultiSlow::Animation4Music_PulseMultiSlow() :
 	AnimationBaseMusic(AMUSIC_PULSEMULTISLOW),

diff --git a/sources/effectengine/Animation4Music_PulseRed.cpp b/sources/effectengine/Animation4Music_PulseRed.cpp
@@ -26,6 +26,7 @@
  */
 
 #include <effectengine/Animation4Music_PulseRed.h>
+#include <base/SoundCapture.h>
 
 Animation4Music_PulseRed::Animation4Music_PulseRed() :
 	AnimationBaseMusic(AMUSIC_PULSERED),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ class AnimationBaseMusic : public AnimationBase

		};

		#include <base/SoundCapture.h>