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

Allow the Qt version to be chosen explicitly #1310

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Allow the Qt version to be chosen explicitly #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bb15d
Allow the Qt version to be chosen explicitly
argilo Oct 9, 2023
fe5b26e
Update news
argilo Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,20 @@ else()
endif()

# 3rd Party Dependency Stuff
find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
if(NOT Qt6_FOUND)
option(FORCE_QT6 "Force Qt6 to be used" OFF)
option(FORCE_QT5 "Force Qt5 to be used" OFF)

if(FORCE_QT6)
find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
elseif(FORCE_QT5)
find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
else()
find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
if(NOT Qt6_FOUND)
find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
endif()
endif()

include(FindPkgConfig)
find_package(Gnuradio-osmosdr REQUIRED)

Expand Down
5 changes: 5 additions & 0 deletions resources/news.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

2.17.2: In progress...

NEW: FORCE_QT6 and FORCE_QT5 CMake options to force Qt version.


2.17.1: Released October 9, 2023

NEW: Delete key clears the waterfall.
Expand Down