nosklo
/
samplebrain
mirror of https://gitlab.com/then-try-this/samplebrain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nosklo:c9b17d03d384cb00b3625e9700e13bbe57f17526
Branches Tags
nosklo:main
nosklo:production
nosklo:development
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release
..
compare: nosklo:69ff4fe7c2f89d8cd97c6421a790f108beb1f1cb
Branches Tags
nosklo:production
nosklo:development
nosklo:main
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release

11 Commits
c9b17d03d3 ... 69ff4fe7c2

Author SHA1 Message Date
Fabian 69ff4fe7c2 Merge branch 'upgrade-to-cmake' into 'main' 
Upgrade build system from qmake to cmake

See merge request then-try-this/samplebrain!11
 2022-10-10 11:03:26 +00:00
fshstk 69fee748c7 Remove Qt .pro file 
CMakeLists.txt now does everything we need
 2022-10-10 13:00:22 +02:00
fshstk bdda87cc16 Update building.md 
- Add info about installing cmake
- Change build instructions from qmake to cmake
- Remove info about installing deps
  We don't need to do this anymore. CMake will do it automatically at
  configure-time!
 2022-10-10 13:00:22 +02:00
fshstk ca7e69f606 Add libsndfile dependency 2022-10-10 13:00:22 +02:00
fshstk 8a6450407b Add portaudio dependency 2022-10-10 13:00:22 +02:00
fshstk 1c82bb7826 Add liblo dependency 2022-10-10 13:00:22 +02:00
fshstk 8aa91d6638 Add fftw3 dependency 2022-10-10 13:00:22 +02:00
fshstk 46a7e31ab2 Fix path to .ui files 2022-10-10 13:00:22 +02:00
fshstk c074b6c028 Ignore build folder 
This should cover all files generated by the build system...
 2022-10-10 13:00:22 +02:00
fshstk 0c2af71eb3 Fix CMakeLists syntax 
target_compile_options requires the PUBLIC/PRIVATE keyword. I don't know
why the qmake2cmake script doesn't provide the correct syntax here...
 2022-10-10 13:00:22 +02:00
fshstk db65ec8829 Run qmake2cmake command 
Command used:
qmake2cmake_all . --min-qt-version 5.15
 2022-10-10 13:00:10 +02:00
2 changed files with 17 additions and 13 deletions
Show Stats Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -1,10 +0,0 @@
build-job:
stage: build
image: ubuntu:22.04
script:
- apt-get update
- apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev
- mkdir -p build
- cd build
- cmake ..
- cmake --build .

20
CMakeLists.txt
View File

@ -12,9 +12,6 @@ set(CMAKE_AUTOMOC ON)
include(GNUInstallDirs) include(GNUInstallDirs)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core) find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
@ -51,19 +48,36 @@ qt_add_executable(samplebrain WIN32 MACOSX_BUNDLE
) )
target_include_directories(samplebrain PRIVATE target_include_directories(samplebrain PRIVATE
. .
/opt/homebrew/include
/usr/local/include
2
brain/src brain/src
) )
target_link_libraries(samplebrain PRIVATE target_link_libraries(samplebrain PRIVATE
# Remove: L..
# Remove: L/opt/homebrew/lib
# Remove: L/usr/local/lib
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::Widgets Qt::Widgets
dl
fftw3 fftw3
lo_shared lo_shared
m
portaudio portaudio
pthread
sndfile sndfile
) )
target_compile_options(samplebrain PUBLIC
-O3
-Wall
-Wno-unused
-std=c++11
)
# Resources: # Resources:
set(samplebrain_resource_files set(samplebrain_resource_files
"app/images/at.png" "app/images/at.png"