diff --git a/CMakeLists.txt b/CMakeLists.txt index 03be4f9..1e5480f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,63 +1,63 @@ project(klimbgrades) cmake_minimum_required(VERSION 2.8.12) set(KF5_MIN_VERSION "5.18.0") set(QT_MIN_VERSION "5.5.0") ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "klimbgrades requires an out of source build. Please create a separate build directory and run 'cmake path_to_kirigami [options]' there.") endif() # Make CPack available to easy generate binary packages include(CPack) include(FeatureSummary) ################# set KDE specific information ################# find_package(ECM 0.0.8 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMSetupVersion) include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) include(ECMPoQmTools) include(KDECompilerSettings NO_POLICY_SCOPE) set(KF5_VERSION "5.22.0") find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2) find_package(KF5Config ${KF5_DEP_VERSION} "5.22.0") find_package(KF5Kirigami2 ${KF5_DEP_VERSION} "5.22.0") ################# Enable C++11 features for clang and gcc ################# if(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") endif() ################# now find all used packages ################# set (QT_MIN_VERSION "5.5.0") find_package(PkgConfig) ######################################################################### add_subdirectory(src) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() install(FILES org.kde.klimbgrades.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) -install(PROGRAMS org.kde.klimbgrades.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) +install(PROGRAMS org.kde.klimbgrades.desktop DESTINATION ${KDE_INSTALL_APPDIR}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/org.kde.klimbgrades.desktop b/org.kde.klimbgrades.desktop index 7590fbe..6d9d00f 100644 --- a/org.kde.klimbgrades.desktop +++ b/org.kde.klimbgrades.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Name=Klimbgradesa -omment=Small application to quickly convert difficulty grades for rock climbing, lead and bouldering scales +Comment=Small application to quickly convert difficulty grades for rock climbing, lead and bouldering scales Exec=klimbgrades %u MimeType=application/x-klimbgrades; Icon=klimbgrades Type=Application Terminal=false Categories=Qt;KDE;Education; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f75fc56..b27fb56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,26 +1,26 @@ if (NOT STATIC_LIBRARY) ecm_create_qm_loader(klimbgrades_QM_LOADER klimbgrades_qt) endif() set(klimbgrades_SRCS availablegradesmodel.cpp data.cpp main.cpp ) qt5_add_resources(RESOURCES resources.qrc) add_executable(klimbgrades ${klimbgrades_SRCS} ${RESOURCES}) target_link_libraries(klimbgrades Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg KF5::ConfigCore) install(TARGETS klimbgrades ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) if (ANDROID) install(FILES klimbgrades.svg DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2/icons) else() - install(FILES klimbgrades.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/breeze/apps/48) + install(FILES klimbgrades.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() #include(KF5KirigamiMacros.cmake) kirigami_package_breeze_icons(ICONS documentinfo view-refresh edit-clear games-highscores)