Merge pull request #1029 from andrewrabert/compiler-stuff

Compiler stuff

Author: Andrew Rabert

.github/workflows/test.yml

@@ -17,11 +17,11 @@ jobs:
     - name: Install build dependencies from debian/control
       run: |
         sudo apt-get update
-        sudo apt-get install --yes devscripts equivs
+        sudo apt-get install --yes devscripts equivs ninja-build
         sudo mk-build-deps -i -r -t "apt-get --yes" debian/control
 
     - name: Configure
-      run: cmake -B build -DCMAKE_BUILD_TYPE=Debug
+      run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
 
     - name: Build
       run: cmake --build build

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10...3.31 FATAL_ERROR)
 
 # use a toolchain file if any for Embedded
 if (EXISTS "${CMAKE_SOURCE_DIR}/toolchain.cmake")

CMakeModules/CompilerFlags.cmake

@@ -1,6 +1,15 @@
 # MSVC goes totally bananas if we pass it -Wall
 if(NOT MSVC)
   enable_if_supported(COMPILER_FLAGS "-Wall")
+  enable_if_supported(COMPILER_FLAGS "-Wextra")
+  enable_if_supported(COMPILER_FLAGS "-Wformat")
+  enable_if_supported(COMPILER_FLAGS "-Werror=format-security")
+  enable_if_supported(COMPILER_FLAGS "-Wshadow")
+  enable_if_supported(COMPILER_FLAGS "-Wundef")
+  enable_if_supported(COMPILER_FLAGS "-Wcast-align")
+  enable_if_supported(COMPILER_FLAGS "-Wmissing-include-dirs")
+  enable_if_supported(COMPILER_FLAGS "-Woverloaded-virtual")
+  enable_if_supported(COMPILER_FLAGS "-Wold-style-cast")
 endif()
 
 enable_if_supported(COMPILER_FLAGS "-Wshorten-64-to-32")
@@ -15,7 +24,6 @@ enable_if_supported(COMPILER_FLAGS_THIRD_PARTY "/wd4244")
 enable_if_supported(COMPILER_FLAGS_THIRD_PARTY "/wd4267")
 
 enable_if_links(LINK_FLAGS_RELEASE "-flto")
-enable_if_links(LINK_FLAGS "-fuse-ld=gold")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}")

CMakeModules/LinuxConfiguration.cmake

@@ -2,7 +2,7 @@ include(GNUInstallDirs)
 
 find_package(X11)
 if(X11_FOUND AND X11_Xrandr_FOUND)
-  include_directories(X11_X11_INCLUDE_PATH X11_Xrandr_INCLUDE_PATH)
+  include_directories(${X11_X11_INCLUDE_PATH} ${X11_Xrandr_INCLUDE_PATH})
   set(X11XRANDR_FOUND 1)
   add_definitions(-DUSE_X11XRANDR)
 else()

CMakeModules/QtConfiguration.cmake

@@ -17,7 +17,9 @@ message(STATUS "Qt root directory: ${QTROOT}")
 
 list(APPEND CMAKE_FIND_ROOT_PATH ${QTROOT})
 list(APPEND CMAKE_PREFIX_PATH ${QTROOT})
-include_directories(${QTROOT}/include)
+if(IS_DIRECTORY "${QTROOT}/include")
+  include_directories(${QTROOT}/include)
+endif()
 
 set(REQUIRED_QT_VERSION "6.0.0")
 

src/CMakeLists.txt

@@ -28,13 +28,12 @@ get_property(ALL_SRCS GLOBAL PROPERTY SRCS_LIST)
 set(MAIN_SRCS main.cpp)
 
 source_group("Source Files" FILES ${MAIN_SRCS})
-set(SOURCES ${MAIN_SRCS} ${ALL_SRCS})
 
 # Set some Objective-C flags.
 # We need to force the Language to C instead of C++
 # and also make sure that we use ARC
 #
-foreach(S ${SOURCES})
+foreach(S ${ALL_SRCS})
   string(REGEX MATCH ".*\\.m$" MATCH_OBJC ${S})
   if(MATCH_OBJC)
     set_property(SOURCE ${S} PROPERTY COMPILE_FLAGS "-fobjc-arc")
@@ -51,6 +50,9 @@ foreach(sfile in ${ALL_SRCS})
   source_group("Source Files\\\\${GNAME}" FILES ${sfile})
 endforeach(sfile in ${ALL_SRCS})
 
+# Build core sources as static library for reuse by tests
+add_library(jmp_core STATIC ${ALL_SRCS})
+
 file(GLOB_RECURSE RESOURCE_FILES ${CMAKE_SOURCE_DIR}/resources/*)
 file(GLOB_RECURSE NATIVE_FILES ${CMAKE_SOURCE_DIR}/native/*)
 
@@ -125,7 +127,7 @@ if(XCODE)
 endif()
 
 get_property(BUNDLED_FILES GLOBAL PROPERTY CONFIG_BUNDLED_FILES)
-add_executable(${MAIN_TARGET} WIN32 MACOSX_BUNDLE ${SOURCES} ${BUNDLED_FILES} ${RESOURCE_FILES} ${XCODE_RESOURCES})
+add_executable(${MAIN_TARGET} WIN32 MACOSX_BUNDLE ${MAIN_SRCS} ${BUNDLED_FILES} ${RESOURCE_FILES} ${XCODE_RESOURCES})
 std_target_properties(${MAIN_TARGET})
 set_target_properties(${MAIN_TARGET} PROPERTIES
   MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/bundle/osx/Info.plist.in
@@ -167,7 +169,8 @@ else()
   set(MPVQT_TARGET MpvQt::MpvQt)
 endif()
 
-target_link_libraries(${MAIN_TARGET}
+# Link core library with all dependencies
+target_link_libraries(jmp_core
   shared
   ${MPV_LIBRARY}
   ${OPENGL_LIBS}
@@ -191,6 +194,8 @@ target_link_libraries(${MAIN_TARGET}
   Qt6::DBus
   ${MPVQT_TARGET}
 )
+
+target_link_libraries(${MAIN_TARGET} jmp_core)
 install(TARGETS ${MAIN_TARGET} DESTINATION ${INSTALL_BIN_DIR})
 
 set(EXE "${MAIN_NAME}.app")

src/core/ComponentManager.cpp

@@ -15,7 +15,7 @@
 #include "ui/WindowManager.h"
 #include "mpris/MprisComponent.h"
 
-#if KONVERGO_OPENELEC
+#ifdef KONVERGO_OPENELEC
 #include "system/openelec/OESystemComponent.h"
 #endif
 
@@ -63,7 +63,7 @@ void ComponentManager::initialize()
   registerComponent(&WindowManager::Get());
   registerComponent(&MprisComponent::Get());
 
-#if KONVERGO_OPENELEC
+#ifdef KONVERGO_OPENELEC
   registerComponent(&OESystemComponent::Get());
 #endif
 

src/display/DisplayComponent.cpp

@@ -65,7 +65,7 @@ bool DisplayComponent::componentInitialize()
 
   if (initializeDisplayManager())
   {
-    QGuiApplication* app = (QGuiApplication*)QGuiApplication::instance();
+    auto* app = qobject_cast<QGuiApplication*>(QGuiApplication::instance());
 
     connect(app, SIGNAL(screenAdded(QScreen*)), this, SLOT(monitorChange()));
     connect(app, SIGNAL(screenRemoved(QScreen*)), this,  SLOT(monitorChange()));

src/display/x11/DisplayManagerX11.cpp

@@ -192,8 +192,8 @@ int DisplayManagerX11::getDisplayFromPoint(int x, int y)
       goto done;
 
     matches = x >= crtc->x && y >= crtc->y &&
-              x < crtc->x + (int)crtc->width &&
-              y < crtc->y + (int)crtc->height;
+              x < crtc->x + static_cast<int>(crtc->width) &&
+              y < crtc->y + static_cast<int>(crtc->height);
 
   done:
     if (crtc)

src/input/InputCEC.cpp

@@ -95,11 +95,11 @@ bool InputCECWorker::init()
   m_configuration.bAutodetectAddress =  CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS;
   m_configuration.iPhysicalAddress = CEC_PHYSICAL_ADDRESS_TV;
   m_configuration.baseDevice = CECDEVICE_AUDIOSYSTEM;
-  m_configuration.bActivateSource = (uint8_t)SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "activatesource").toBool();
-  m_configuration.iHDMIPort = (quint8)SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "hdmiport").toInt();
+  m_configuration.bActivateSource = static_cast<uint8_t>(SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "activatesource").toBool());
+  m_configuration.iHDMIPort = static_cast<quint8>(SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "hdmiport").toInt());
 
   // open libcec
-  m_adapter = (ICECAdapter*)CECInitialise(&m_configuration);
+  m_adapter = static_cast<ICECAdapter*>(CECInitialise(&m_configuration));
   if (!m_adapter)
   {
     qCritical() << "Unable to initialize libCEC.";
@@ -343,7 +343,7 @@ void InputCECWorker::CecCommand(void *cbParam, const cec_command *command)
         }
       }
 
-      cmdString = cec->getCommandString((cec_user_control_code)command->parameters[0]);
+      cmdString = cec->getCommandString(static_cast<cec_user_control_code>(command->parameters[0]));
 
       if (!cmdString.isEmpty())
       {
@@ -382,6 +382,7 @@ void InputCECWorker::CecCommand(void *cbParam, const cec_command *command)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void InputCECWorker::CecAlert(void *cbParam, const libcec_alert type, const libcec_parameter param)
 {
+  (void)param;
   bool reopen = false;
 
   switch (type)