Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Education
Minuet
Commits
bf39d6a6
Commit
bf39d6a6
authored
Aug 28, 2022
by
Laurent Montel
Browse files
Adapt build system to qt6
parent
7b178199
Changes
6
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -14,8 +14,8 @@ set (MINUET_VERSION "0.4.0.${RELEASE_SERVICE_COMPACT_VERSION}")
project
(
minuet VERSION
${
MINUET_VERSION
}
)
set
(
KF5_MIN_VERSION
"5.
86
.0"
)
set
(
QT_MIN_VERSION
"5.
7.0
"
)
set
(
KF5_MIN_VERSION
"5.
90
.0"
)
set
(
QT_MIN_VERSION
"5.
15.2
"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
minuet_SOURCE_DIR
}
/cmake
)
...
...
@@ -33,7 +33,7 @@ ecm_setup_version(${MINUET_VERSION} VARIABLE_PREFIX MINUET
VERSION_HEADER
"
${
CMAKE_CURRENT_BINARY_DIR
}
/src/app/minuet_version.h"
)
find_package
(
Qt
5
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
Core
Gui
Qml
...
...
src/app/CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -6,7 +6,7 @@ set(minuet_SRCS
exercisecontroller.cpp
)
qt
5
_add_resources
(
minuet_SRCS qml.qrc
)
qt_add_resources
(
minuet_SRCS qml.qrc
)
IF
(
NOT
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Android"
)
set
(
minuet_ICONS_PNG
...
...
@@ -55,12 +55,12 @@ else()
endif
()
target_link_libraries
(
minuet
Qt
5
::Core
Qt
5
::Gui
Qt
5
::Qml
Qt
5
::Quick
Qt
5
::QuickControls2
Qt
5
::Svg
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::QuickControls2
Qt::Svg
Minuet::Interfaces
Minuet::Utils
)
...
...
src/interfaces/CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -15,8 +15,8 @@ set_target_properties(minuetinterfaces PROPERTIES VERSION 0.3.0)
generate_export_header
(
minuetinterfaces EXPORT_FILE_NAME minuetinterfacesexport.h
)
target_link_libraries
(
minuetinterfaces
Qt
5
::Core
Qt
5
::Quick
Qt::Core
Qt::Quick
)
IF
(
NOT
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Android"
)
...
...
src/plugins/csoundsoundcontroller/CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -29,7 +29,7 @@ add_library(minuetcsoundsoundcontroller ${csoundsoundcontroller_PLUGIN_SRCS})
add_library
(
Minuet::CsoundSoundController ALIAS minuetcsoundsoundcontroller
)
target_link_libraries
(
minuetcsoundsoundcontroller
Qt
5
::Core
Qt::Core
Minuet::Interfaces
${
CSOUND_LIBS
}
)
...
...
src/plugins/fluidsynthsoundcontroller/CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -5,7 +5,7 @@ set(fluidsynthsoundcontroller_PLUGIN_SRCS
add_library
(
minuetfluidsynthsoundcontroller MODULE
${
fluidsynthsoundcontroller_PLUGIN_SRCS
}
)
target_link_libraries
(
minuetfluidsynthsoundcontroller
Qt
5
::Core
Qt::Core
Minuet::Interfaces
Minuet::Utils
FluidSynth::FluidSynth
...
...
src/utils/CMakeLists.txt
View file @
bf39d6a6
...
...
@@ -10,5 +10,5 @@ add_library(Minuet::Utils ALIAS minuetutils)
target_link_libraries
(
minuetutils
PRIVATE
Qt
5
::Core
Qt::Core
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment