deepblue/samplebrain
1
0
Fork 0
mirror of https://gitlab.com/then-try-this/samplebrain.git synced 2025-05-12 18:47:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switched (back) to qt6

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -3,7 +3,7 @@ build-job:
image: ubuntu:22.04 image: ubuntu:22.04
script: script:
- apt-get update - 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 - mkdir -p build
- cd build - cd build
- cmake .. - cmake ..

16
CMakeLists.txt
View File

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