ENH: Remove QT5 modules from Qt6 QTMODULES

Only search for one of Qt5 or Qt6

Never search for both Qt5 and Qt6 simultaneously.
Requiring user to specify the source bindings to
create.

Author: hjmjohnson

CMakeLists.txt

@@ -18,7 +18,13 @@ enable_testing()
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
+option(FORCE_BUILD_QT5 "Force Qt5 build instead of Qt6" OFF)
+
+if(FORCE_BUILD_QT5)
+  find_package(Qt5 NAMES Qt5 REQUIRED COMPONENTS Core)
+else()
+  find_package(Qt6 NAMES Qt6 REQUIRED COMPONENTS Core)
+endif()
 find_package(Python3 COMPONENTS Development)
 
 set(PYTHONQT_SUFFIX Qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}-Python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})

extensions/PythonQt_QtAll/CMakeLists.txt

@@ -18,8 +18,10 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Core)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
-list(APPEND QTMODULES Core Gui Svg Sql Network OpenGL Xml XmlPatterns Multimedia Qml Quick UiTools WebEngineWidgets WebKit)
-
+list(APPEND QTMODULES Core Gui Svg Sql Network OpenGL Xml Multimedia Qml Quick UiTools WebEngineWidgets)
+if(${QT_VERSION_MAJOR} EQUAL 5) #QT5
+        list(APPEND QTMODULES XmlPatterns WebKit)
+endif()
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${QTMODULES})
 
 foreach(QtModule IN LISTS QTMODULES)

generator/CMakeLists.txt

@@ -6,8 +6,11 @@ add_subdirectory(parser)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets Xml REQUIRED)
+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 )
 list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_LIST_DIR}/qtscript_masterinclude.h")
@@ -26,7 +29,6 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
 )
 
 if (${QT_VERSION_MAJOR} VERSION_GREATER 5)
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core5Compat REQUIRED)
     target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core5Compat)
 endif()
 

generator/parser/CMakeLists.txt

@@ -4,8 +4,11 @@ add_subdirectory(rpp)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+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)
 

generator/parser/rpp/CMakeLists.txt

@@ -3,8 +3,11 @@ project(rpp LANGUAGES CXX)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+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)