Commit bf39d6a6 authored by Laurent Montel's avatar Laurent Montel
Browse files

Adapt build system to qt6

parent 7b178199
......@@ -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(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Core
Gui
Qml
......
......@@ -6,7 +6,7 @@ set(minuet_SRCS
exercisecontroller.cpp
)
qt5_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
Qt5::Core
Qt5::Gui
Qt5::Qml
Qt5::Quick
Qt5::QuickControls2
Qt5::Svg
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::QuickControls2
Qt::Svg
Minuet::Interfaces
Minuet::Utils
)
......
......@@ -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
Qt5::Core
Qt5::Quick
Qt::Core
Qt::Quick
)
IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
......
......@@ -29,7 +29,7 @@ add_library(minuetcsoundsoundcontroller ${csoundsoundcontroller_PLUGIN_SRCS})
add_library(Minuet::CsoundSoundController ALIAS minuetcsoundsoundcontroller)
target_link_libraries(minuetcsoundsoundcontroller
Qt5::Core
Qt::Core
Minuet::Interfaces
${CSOUND_LIBS}
)
......
......@@ -5,7 +5,7 @@ set(fluidsynthsoundcontroller_PLUGIN_SRCS
add_library(minuetfluidsynthsoundcontroller MODULE ${fluidsynthsoundcontroller_PLUGIN_SRCS})
target_link_libraries(minuetfluidsynthsoundcontroller
Qt5::Core
Qt::Core
Minuet::Interfaces
Minuet::Utils
FluidSynth::FluidSynth
......
......@@ -10,5 +10,5 @@ add_library(Minuet::Utils ALIAS minuetutils)
target_link_libraries(minuetutils
PRIVATE
Qt5::Core
Qt::Core
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment