mirror of
https://gitlab.com/then-try-this/samplebrain.git
synced 2025-05-12 10:37:20 +00:00
back to qt5 again to attempt win ci to work (choco doesn't seem to have qt6 yet)
This commit is contained in:
parent
5573355c8e
commit
0ab061eb0e
@ -1,23 +1,23 @@
|
||||
build-job:
|
||||
build-ubuntu:
|
||||
stage: build
|
||||
image: ubuntu:22.04
|
||||
script:
|
||||
- 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
|
||||
- cd build
|
||||
- cmake ..
|
||||
- cmake --build .
|
||||
- cmake --build . --target samplebrain
|
||||
|
||||
build-win64:
|
||||
tags:
|
||||
- "windows"
|
||||
before_script:
|
||||
- choco install -y cmake python
|
||||
- choco install -y cmake python qt5-default
|
||||
- $env:Path += ';C:\Program Files\CMake\bin'
|
||||
stage: build
|
||||
script:
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake ..
|
||||
- cmake --build .
|
||||
- cmake --build . --target samplebrain
|
||||
|
@ -15,7 +15,7 @@ set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
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(OpenMP)
|
||||
|
||||
@ -56,9 +56,9 @@ target_include_directories(samplebrain PRIVATE
|
||||
)
|
||||
|
||||
target_link_libraries(samplebrain PRIVATE
|
||||
Qt::Core
|
||||
Qt::Gui
|
||||
Qt::Widgets
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
fftw3
|
||||
lo_shared
|
||||
portaudio
|
||||
@ -80,11 +80,11 @@ set(samplebrain_resource_files
|
||||
"app/images/stop.png"
|
||||
)
|
||||
|
||||
qt_add_resources(samplebrain "samplebrain"
|
||||
qt5_add_resources(samplebrain "samplebrain"
|
||||
PREFIX
|
||||
"/images"
|
||||
BASE
|
||||
"app"
|
||||
#BASE
|
||||
# "app"
|
||||
FILES
|
||||
${samplebrain_resource_files}
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user