Commit 68e7fab7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Time to increase version + use qt_ macro + Qt::

parent 6f63fd5e
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.16)
# KDE Application Version, managed by release script
set(RELEASE_SERVICE_VERSION_MAJOR "21")
......@@ -7,11 +7,11 @@ set(RELEASE_SERVICE_VERSION_MICRO "70")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(kalgebra VERSION ${RELEASE_SERVICE_VERSION})
find_package(ECM 1.7.0 REQUIRED NO_MODULE)
set(KF5_MIN_VERSION "5.83.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH})
find_package(Qt5 5.14 REQUIRED NO_MODULE COMPONENTS Qml Quick Xml Svg PrintSupport Test)
find_package(Qt5 5.15 REQUIRED NO_MODULE COMPONENTS Qml Quick Xml Svg PrintSupport Test)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......
......@@ -13,7 +13,7 @@ if(HAVE_FREE_HISTORY_ENTRY)
endif()
add_executable(calgebra main.cpp)
target_link_libraries(calgebra Qt5::Core ${READLINE_LIBRARY} KF5::Analitza)
target_link_libraries(calgebra Qt::Core ${READLINE_LIBRARY} KF5::Analitza)
install(TARGETS calgebra ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
qt5_add_resources(KALGEBRAMOBILE_SRCS resources.qrc)
qt_add_resources(KALGEBRAMOBILE_SRCS resources.qrc)
add_executable(kalgebramobile
../src/consolemodel.cpp
......@@ -7,7 +7,7 @@ add_executable(kalgebramobile
main.cpp
${KALGEBRAMOBILE_SRCS})
target_link_libraries(kalgebramobile Qt5::Qml Qt5::Quick Qt5::Gui
target_link_libraries(kalgebramobile Qt::Qml Qt::Quick Qt::Gui
KF5::CoreAddons KF5::I18n KF5::Analitza KF5::AnalitzaGui KF5::AnalitzaPlot)
set(DESKTOPFILE_INSTALL ${KDE_INSTALL_APPDIR})
......@@ -19,10 +19,10 @@ if(ANDROID)
find_package(Qt5QuickControls2 REQUIRED)
find_package(KF5Kirigami2 REQUIRED)
kirigami_package_breeze_icons(ICONS list-add)
target_link_libraries(kalgebramobile Qt5::Svg KF5::Kirigami2 Qt5::QuickControls2)
target_link_libraries(kalgebramobile Qt::Svg KF5::Kirigami2 Qt::QuickControls2)
else()
find_package(Qt5Widgets REQUIRED)
target_link_libraries(kalgebramobile Qt5::Widgets)
target_link_libraries(kalgebramobile Qt::Widgets)
endif()
install(TARGETS kalgebramobile ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -14,7 +14,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-kalgebra.png")
ecm_add_app_icon(kalgebra_SRCS ICONS ${ICONS_SRCS})
add_executable(kalgebra ${kalgebra_SRCS})
target_link_libraries(kalgebra Qt5::Widgets Qt5::PrintSupport Qt5::WebEngineWidgets KF5::I18n
target_link_libraries(kalgebra Qt::Widgets Qt::PrintSupport Qt::WebEngineWidgets KF5::I18n
KF5::CoreAddons KF5::WidgetsAddons KF5::ConfigWidgets
KF5::XmlGui # HelpMenu
KF5::KIOCore
......
add_executable(docbook_analitzacommands main.cpp)
target_link_libraries(docbook_analitzacommands KF5::AnalitzaGui Qt5::Widgets Qt5::Core)
target_link_libraries(docbook_analitzacommands KF5::AnalitzaGui Qt::Widgets Qt::Core)
Markdown is supported
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