From 9c5c50ef953f72fcfecca2b7801f5c3928c5cb0e Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Wed, 13 Nov 2019 16:27:28 -0500 Subject: [PATCH] Move extra files to packaging. --- CMakeLists.txt | 10 +++++----- .../org.eyecreate.qiflora.appdata.xml | 0 .../org.eyecreate.qiflora.desktop | 0 .../org.eyecreate.qiflora.json | 0 .../org.eyecreate.qiflora.svg | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename org.eyecreate.qiflora.appdata.xml => packaging/org.eyecreate.qiflora.appdata.xml (100%) rename org.eyecreate.qiflora.desktop => packaging/org.eyecreate.qiflora.desktop (100%) rename org.eyecreate.qiflora.json => packaging/org.eyecreate.qiflora.json (100%) rename org.eyecreate.qiflora.svg => packaging/org.eyecreate.qiflora.svg (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 434c521..1cfe331 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ project(qiflora) cmake_minimum_required(VERSION 2.8.12) -set(KF5_MIN_VERSION "5.18.0") -set(QT_MIN_VERSION "5.5.0") +set(KF5_MIN_VERSION "5.44.0") +set(QT_MIN_VERSION "5.12.0") ################# Disallow in-source build ################# @@ -38,8 +38,8 @@ set(CMAKE_CXX_STANDARD 11) ################# build and install ################# add_subdirectory(src) -install(PROGRAMS org.eyecreate.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES org.eyecreate.qiflora.svg DESTINATION ${KDE_INSTALL_ICONDIR}) -install(FILES org.eyecreate.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) +install(PROGRAMS packaging/org.eyecreate.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES packaging/org.eyecreate.qiflora.svg DESTINATION ${KDE_INSTALL_ICONDIR}) +install(FILES packaging/org.eyecreate.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/org.eyecreate.qiflora.appdata.xml b/packaging/org.eyecreate.qiflora.appdata.xml similarity index 100% rename from org.eyecreate.qiflora.appdata.xml rename to packaging/org.eyecreate.qiflora.appdata.xml diff --git a/org.eyecreate.qiflora.desktop b/packaging/org.eyecreate.qiflora.desktop similarity index 100% rename from org.eyecreate.qiflora.desktop rename to packaging/org.eyecreate.qiflora.desktop diff --git a/org.eyecreate.qiflora.json b/packaging/org.eyecreate.qiflora.json similarity index 100% rename from org.eyecreate.qiflora.json rename to packaging/org.eyecreate.qiflora.json diff --git a/org.eyecreate.qiflora.svg b/packaging/org.eyecreate.qiflora.svg similarity index 100% rename from org.eyecreate.qiflora.svg rename to packaging/org.eyecreate.qiflora.svg -- GitLab