switched (back) to qt6

This commit is contained in:
Dave Griffiths 2022-10-29 13:49:15 +01:00
parent b983408bd7
commit 7a02dcfa3c
2 changed files with 9 additions and 9 deletions

View File

@ -3,7 +3,7 @@ build-job:
image: ubuntu:22.04
script:
- apt-get update
- apt-get install -y git cmake g++ freeglut3-dev qtbase5-dev qt5-qmake qtbase5-dev-tools
- apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev qt5-qmake qtbase5-dev-tools
- mkdir -p build
- cd build
- cmake ..

View File

@ -15,8 +15,8 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
find_package(Qt5 REQUIRED COMPONENTS Gui Widgets)
find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
find_package(OpenMP)
add_executable(samplebrain WIN32 MACOSX_BUNDLE
@ -56,9 +56,9 @@ target_include_directories(samplebrain PRIVATE
)
target_link_libraries(samplebrain PRIVATE
Qt5::Core
Qt5::Gui
Qt5::Widgets
Qt::Core
Qt::Gui
Qt::Widgets
fftw3
lo_shared
portaudio
@ -80,11 +80,11 @@ set(samplebrain_resource_files
"app/images/stop.png"
)
qt5_add_resources(samplebrain "samplebrain"
qt_add_resources(samplebrain "samplebrain"
PREFIX
"/images"
# BASE
# "app"
BASE
"app"
FILES
${samplebrain_resource_files}
)