Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed building with Qt5 and Qt6 versions installed in the same time #415

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Fixed building with Qt5 and Qt6 versions installed in the same time #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/cmake_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,28 @@ jobs:
compiler: gcc
qt_version: "5.15.2"
modules: ""
use_qt6: "OFF"

- toolchain: macos-clang
os: macos-latest
compiler: clang
qt_version: "5.15.2"
modules: ""
use_qt6: "OFF"

- toolchain: windows-msvc
os: windows-latest
compiler: msvc
qt_version: "5.15.2"
modules: ""
use_qt6: "OFF"

- toolchain: windows-msvc
os: windows-latest
compiler: msvc
qt_version: "6.3.0"
modules: "qt5compat"
use_qt6: "ON"

steps:
- name: Checkout Code
Expand All @@ -74,7 +78,7 @@ jobs:
arch: x64

- name: Configure (${{ matrix.configuration }})
run: cmake -S . -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_DOCS=OFF
run: cmake -S . -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_DOCS=OFF -DUSE_QT6=${{ matrix.use_qt6 }}

- name: Build with ${{ matrix.compiler }}
run: cmake --build build --config ${{ matrix.configuration }}
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ option(BUILD_DOCS "Build Documentation" "${QT_NODES_DEVELOPER_DEFAULTS}")
option(BUILD_SHARED_LIBS "Build as shared library" ON)
option(BUILD_DEBUG_POSTFIX_D "Append d suffix to debug libraries" OFF)
option(QT_NODES_FORCE_TEST_COLOR "Force colorized unit test output" OFF)
option(USE_QT6 "Build with Qt6 (Enabled by default)" ON)

enable_testing()

Expand All @@ -46,7 +47,12 @@ endif()

add_subdirectory(external)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
if(USE_QT6)
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets)
else()
find_package(QT NAMES Qt5 REQUIRED COMPONENTS Widgets)
endif()

find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets Gui OpenGL)
message(STATUS "QT_VERSION: ${QT_VERSION}, QT_DIR: ${QT_DIR}")

Expand Down
10 changes: 10 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ Current State (v3)
Building
========

Set this option to false if you want to build with Qt5 version instead of Qt6:

::

USE_QT6

mkdir build && cd build && cmake .. -DUSE_QT6=on
or
mkdir build && cd build && cmake .. -DUSE_QT6=off

Linux
-----

Expand Down