include uncrustify in project, some minor fixups

This commit is contained in:
Martin Rotter 2022-01-31 19:48:10 +01:00
parent ebbda089d9
commit da0c7556c2

View File

@ -98,6 +98,9 @@ if(${FORCE_COLORED_OUTPUT})
endif() endif()
endif() endif()
# Aux files not used for build but include in project.
add_custom_target(AuxFiles SOURCES "resources/scripts/uncrustify/uncrustify.cfg")
# Global compilation switches. # Global compilation switches.
option(BUILD_WITH_QT6 "Build application with Qt 6" OFF) option(BUILD_WITH_QT6 "Build application with Qt 6" OFF)
option(USE_WEBENGINE "Use QtWebEngine for embedded web browser" ON) option(USE_WEBENGINE "Use QtWebEngine for embedded web browser" ON)
@ -149,25 +152,28 @@ else()
if(Qt5Core_VERSION VERSION_LESS 5.15.0) if(Qt5Core_VERSION VERSION_LESS 5.15.0)
# Compatibility macros. # Compatibility macros.
macro(qt_add_resources) macro(qt_add_resources)
qt5_add_resources(${ARGN}) qt5_add_resources(${ARGN})
endmacro() endmacro()
macro(qt_add_big_resources) macro(qt_add_big_resources)
qt5_add_big_resources(${ARGN}) qt5_add_big_resources(${ARGN})
endmacro() endmacro()
macro(qt_create_translation) macro(qt_create_translation)
qt5_create_translation(${ARGN}) qt5_create_translation(${ARGN})
endmacro() endmacro()
macro(qt_add_translation) macro(qt_add_translation)
qt5_add_translation(${ARGN}) qt5_add_translation(${ARGN})
endmacro() endmacro()
endif() endif()
endif() endif()
if(NOT OS2) #if(NOT OS2)
macro(qt_add_resources) # macro(qt_add_resources)
qt_add_big_resources(${ARGN}) # qt_add_big_resources(${ARGN})
endmacro() # endmacro()
endif() #endif()
# Process oauth service secrets. # Process oauth service secrets.
if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "") if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "")