ENH: Simplify Qt version handling in CMake and consolidate component requirements

Removed repetitive Qt version conditionals across multiple CMake files. Consolidated and streamlined required Qt components for both Qt5 and Qt6, ensuring consistency and reducing redundancy.

Author: hjmjohnson

CMakeLists.txt

@@ -21,18 +21,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 option(FORCE_BUILD_QT5 "Force Qt5 build instead of Qt6" OFF)
 
 if(FORCE_BUILD_QT5)
-  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core)
+  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core Widgets Xml)
   string(REPLACE "." ";" qt_version_list ${Qt5_VERSION})
 else()
-  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core)
+  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core Widgets Xml Core5Compat)
   string(REPLACE "." ";" qt_version_list ${Qt6_VERSION})
 endif()
 list(GET qt_version_list 0 QT_VERSION_MAJOR)
 list(GET qt_version_list 1 QT_VERSION_MINOR)
 list(GET qt_version_list 1 QT_VERSION_PATCH)
 message(STATUS "QT_VERSION_MAJOR = ${QT_VERSION_MAJOR}")
 
-find_package(Python3 COMPONENTS Development)
+find_package(Python3 COMPONENTS Development REQUIRED)
 
 # Set the environment as defined in Readme.md
 # Set environment variables for Python

generator/CMakeLists.txt

@@ -1,17 +1,10 @@
-cmake_minimum_required(VERSION 3.27)
 project(PythonQtGenerator LANGUAGES CXX)
 
 add_subdirectory(parser)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-if(FORCE_BUILD_QT5)
-  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core Widgets Xml)
-else()
-  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core Widgets Xml Core5Compat)
-endif()
-
 file(GLOB SOURCES *.h *.cpp *.qrc simplecpp/*.h simplecpp/*.cpp )
 # Explicitly exclude qtscript_masterinclude.h
 list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_LIST_DIR}/qtscript_masterinclude.h")

generator/parser/CMakeLists.txt

@@ -4,12 +4,6 @@ add_subdirectory(rpp)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-if(FORCE_BUILD_QT5)
-  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core)
-else()
-  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core)
-endif()
-
 file(GLOB SOURCES *.h *.cpp)
 
 add_library(${PROJECT_NAME} INTERFACE)

generator/parser/rpp/CMakeLists.txt

@@ -3,12 +3,6 @@ project(rpp LANGUAGES CXX)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-if(FORCE_BUILD_QT5)
-  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core)
-else()
-  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core)
-endif()
-
 file(GLOB SOURCES *.h preprocessor.cpp)
 
 add_library(${PROJECT_NAME} INTERFACE)

src/CMakeLists.txt

@@ -2,9 +2,6 @@ project(Core LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets REQUIRED)
-find_package(Python3 COMPONENTS Development REQUIRED)
-
 file(GLOB SOURCES *.h *.cpp)
 
 if(BUILD_SHARED_LIBS)

tests/CMakeLists.txt

@@ -2,7 +2,7 @@ project(PythonQtTest LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Test REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets Test REQUIRED)
 
 file(GLOB SOURCES *.h *.cpp)