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

back to qt5 again to attempt win ci to work (choco doesn't seem to have qt6 yet)

Browse Source
This commit is contained in:
Dave Griffiths 2022-10-30 18:37:28 +00:00
parent 5573355c8e
commit 0ab061eb0e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -1,23 +1,23 @@
build-job: build-ubuntu:
stage: build stage: build
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 qt6-base-dev - apt-get install -y git cmake g++ freeglut3-dev qtbase5-dev qt5-qmake qtbase5-dev-tools
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. - cmake ..
- cmake --build . - cmake --build . --target samplebrain
build-win64: build-win64:
tags: tags:
- "windows" - "windows"
before_script: before_script:
- choco install -y cmake python - choco install -y cmake python qt5-default
- $env:Path += ';C:\Program Files\CMake\bin' - $env:Path += ';C:\Program Files\CMake\bin'
stage: build stage: build
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. - cmake ..
- cmake --build . - cmake --build . --target samplebrain

14
CMakeLists.txt
View File

@ -15,7 +15,7 @@ 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 Qt6 REQUIRED COMPONENTS Core) find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
find_package(OpenMP) find_package(OpenMP)
@ -56,9 +56,9 @@ target_include_directories(samplebrain PRIVATE
) )
target_link_libraries(samplebrain PRIVATE target_link_libraries(samplebrain PRIVATE
Qt::Core Qt5::Core
Qt::Gui Qt5::Gui
Qt::Widgets Qt5::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"
) )
qt_add_resources(samplebrain "samplebrain" qt5_add_resources(samplebrain "samplebrain"
PREFIX PREFIX
"/images" "/images"
BASE #BASE
"app" # "app"
FILES FILES
${samplebrain_resource_files} ${samplebrain_resource_files}
) )