Configuration - add option to build against Qt6

Author: gkv311

.github/workflows/build_linux_gcc.yml .github/workflows/build_linux_gcc_qt5.yml.github/workflows/build_linux_gcc.yml renamed to .github/workflows/build_linux_gcc_qt5.yml

@@ -1,4 +1,4 @@
-name: Build (Linux/GCC)
+name: Build (Linux/GCC/Qt5)
 on:
   push:
     branches: [ master ]
@@ -29,7 +29,7 @@ jobs:
     - name: Configure project
       run: |
         mkdir "build"
-        cmake -G Ninja -S . -B "./build"
+        cmake -G Ninja -S . -B "./build" -D QT_VERSION=Qt5
     - name: Build project
       run: |
         cmake --build "./build" --config Release

.github/workflows/build_linux_gcc_qt6.yml

@@ -0,0 +1,35 @@
+name: Build (Linux/GCC/Qt6)
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  Ubuntu:
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Clone Tree
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          g++ cmake ninja-build \
+          libocct-draw-dev libocct-visualization-dev libocct-ocaf-dev libocct-modeling-data-dev \
+          libocct-modeling-algorithms-dev libocct-foundation-dev libocct-data-exchange-dev \
+          libgl-dev libegl-dev \
+          tcllib tklib tcl-dev tk-dev \
+          libtbb-dev \
+          qt6-base-dev qt6-declarative-dev qml6-module-qtquick-controls qml6-module-qtquick-templates \
+          xvfb
+    - name: Configure project
+      run: |
+        mkdir "build"
+        cmake -G Ninja -S . -B "./build" -D QT_VERSION=Qt6
+    - name: Build project
+      run: |
+        cmake --build "./build" --config Release

occt-qopenglwidget/CMakeLists.txt

@@ -47,13 +47,21 @@ endif()
 # Find OpenGL
 find_package (OpenGL REQUIRED)
 
-# Find Qt5
+# Find Qt
+set (QT_VERSION "Qt5" CACHE STRING "Qt major version to use")
+set_property (CACHE QT_VERSION PROPERTY STRINGS Qt5 Qt6)
 set (CMAKE_AUTOUIC ON)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
 set_property (GLOBAL PROPERTY AUTOMOC_SOURCE_GROUP "Generated Files/Moc")
 set_property (GLOBAL PROPERTY AUTORCC_SOURCE_GROUP "Generated Files/Resources")
-find_package (Qt5 COMPONENTS Widgets REQUIRED)
+if ("${QT_VERSION}" STREQUAL "Qt6")
+  set (QT_COMPONENT_OPENGLWIDGETS "OpenGLWidgets")
+elseif()
+  set (QT_COMPONENT_OPENGLWIDGETS "Widgets")
+endif()
+find_package (${QT_VERSION} COMPONENTS ${QT_COMPONENT_OPENGLWIDGETS} REQUIRED)
+message (STATUS "Using ${QT_VERSION} from \"${${QT_VERSION}_DIR}\"")
 
 # Find Open CASCADE Technology
 find_package (OpenCASCADE REQUIRED)
@@ -77,12 +85,12 @@ add_executable (${PROJECT_NAME}
   OcctGlTools.cpp
   OcctQtTools.h
 )
-target_link_libraries (${PROJECT_NAME} PRIVATE Qt5::Widgets ${OpenCASCADE_LIBS} ${OPENGL_LIBRARIES})
+target_link_libraries (${PROJECT_NAME} PRIVATE ${QT_VERSION}::${QT_COMPONENT_OPENGLWIDGETS} ${OpenCASCADE_LIBS} ${OPENGL_LIBRARIES})
 
 # auxiliary development environment
 if (MSVC)
   set (X_COMPILER_BITNESS x64)
-  get_target_property (QtCore_location Qt5::Core LOCATION)
+  get_target_property (QtCore_location ${QT_VERSION}::Core LOCATION)
   get_filename_component (QT_BINARY_DIR ${QtCore_location} DIRECTORY)
   set (QT_PLUGINS_DIR)
   if (EXISTS "${QT_BINARY_DIR}/../plugins")

occt-qwidget/CMakeLists.txt

@@ -47,13 +47,16 @@ endif()
 # Find OpenGL
 find_package (OpenGL REQUIRED)
 
-# Find Qt5
+# Find Qt
+set (QT_VERSION "Qt5" CACHE STRING "Qt major version to use")
+set_property (CACHE QT_VERSION PROPERTY STRINGS Qt5 Qt6)
 set (CMAKE_AUTOUIC ON)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
 set_property (GLOBAL PROPERTY AUTOMOC_SOURCE_GROUP "Generated Files/Moc")
 set_property (GLOBAL PROPERTY AUTORCC_SOURCE_GROUP "Generated Files/Resources")
-find_package (Qt5 COMPONENTS Widgets REQUIRED)
+find_package (${QT_VERSION} COMPONENTS Widgets REQUIRED)
+message (STATUS "Using ${QT_VERSION} from \"${${QT_VERSION}_DIR}\"")
 
 # Find Open CASCADE Technology
 find_package (OpenCASCADE REQUIRED)
@@ -75,12 +78,12 @@ add_executable (${PROJECT_NAME}
   OcctQWidgetViewer.h
   OcctQWidgetViewer.cpp
 )
-target_link_libraries (${PROJECT_NAME} PRIVATE Qt5::Widgets ${OpenCASCADE_LIBS} ${OPENGL_LIBRARIES})
+target_link_libraries (${PROJECT_NAME} PRIVATE ${QT_VERSION}::Widgets ${OpenCASCADE_LIBS} ${OPENGL_LIBRARIES})
 
 # auxiliary development environment
 if (MSVC)
   set (X_COMPILER_BITNESS x64)
-  get_target_property (QtCore_location Qt5::Core LOCATION)
+  get_target_property (QtCore_location ${QT_VERSION}::Core LOCATION)
   get_filename_component (QT_BINARY_DIR ${QtCore_location} DIRECTORY)
   set (QT_PLUGINS_DIR)
   if (EXISTS "${QT_BINARY_DIR}/../plugins")