From 4cee2535ee456b87b8b47a3a2eee65e98b3f1ee5 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 17 Feb 2015 03:37:06 +0300 Subject: [PATCH] add desktop files reconfiguring fix target on cmake builds improve cmake version check logic --- sources/CMakeLists.txt | 6 +++++- sources/awesome-widget-kf5/CMakeLists.txt | 3 +++ sources/awesome-widget-kf5/{package => }/metadata.desktop | 0 sources/desktop-panel-kf5/CMakeLists.txt | 3 +++ sources/desktop-panel-kf5/{package => }/metadata.desktop | 0 sources/translations/awesome-widget/CMakeLists.txt | 2 +- sources/translations/desktop-panel/CMakeLists.txt | 2 +- 7 files changed, 13 insertions(+), 3 deletions(-) rename sources/awesome-widget-kf5/{package => }/metadata.desktop (100%) rename sources/desktop-panel-kf5/{package => }/metadata.desktop (100%) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 1cc1e1c..2d5d5f3 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.12) +cmake_minimum_required (VERSION 2.8) cmake_policy (SET CMP0003 OLD) cmake_policy (SET CMP0002 OLD) @@ -22,6 +22,10 @@ message (STATUS "Version: ${PROJECT_VERSION}") message (STATUS "Build date: ${CURRENT_DATE}") option (BUILD_KDE4 "Build on KDE4" OFF) +# update minimum cmake version +if (NOT BUILD_KDE4) + cmake_minimum_required (VERSION 2.8.12) +endif () # flags if (CMAKE_COMPILER_IS_GNUCXX) diff --git a/sources/awesome-widget-kf5/CMakeLists.txt b/sources/awesome-widget-kf5/CMakeLists.txt index 0d105f3..54e4dbe 100644 --- a/sources/awesome-widget-kf5/CMakeLists.txt +++ b/sources/awesome-widget-kf5/CMakeLists.txt @@ -2,6 +2,9 @@ set (SUBPROJECT plasma_applet_awesome-widget) message (STATUS "Subproject ${SUBPROJECT}") +# prepare +configure_file (metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop) + find_package (ECM 0.0.12 REQUIRED NO_MODULE) set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/sources/awesome-widget-kf5/package/metadata.desktop b/sources/awesome-widget-kf5/metadata.desktop similarity index 100% rename from sources/awesome-widget-kf5/package/metadata.desktop rename to sources/awesome-widget-kf5/metadata.desktop diff --git a/sources/desktop-panel-kf5/CMakeLists.txt b/sources/desktop-panel-kf5/CMakeLists.txt index 4173e9c..52810f7 100644 --- a/sources/desktop-panel-kf5/CMakeLists.txt +++ b/sources/desktop-panel-kf5/CMakeLists.txt @@ -2,6 +2,9 @@ set (SUBPROJECT plasma_applet_desktop-panel) message (STATUS "Subproject ${SUBPROJECT}") +# prepare +configure_file (metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop) + find_package (ECM 0.0.12 REQUIRED NO_MODULE) set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/sources/desktop-panel-kf5/package/metadata.desktop b/sources/desktop-panel-kf5/metadata.desktop similarity index 100% rename from sources/desktop-panel-kf5/package/metadata.desktop rename to sources/desktop-panel-kf5/metadata.desktop diff --git a/sources/translations/awesome-widget/CMakeLists.txt b/sources/translations/awesome-widget/CMakeLists.txt index 04af4f7..00b0c06 100644 --- a/sources/translations/awesome-widget/CMakeLists.txt +++ b/sources/translations/awesome-widget/CMakeLists.txt @@ -19,4 +19,4 @@ foreach (_current_PO_FILE ${_po_files}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/ RENAME ${MO_NAME}) list (APPEND _gmoFiles ${_gmoFile}) endforeach (_current_PO_FILE) -add_custom_target (pofiles ALL DEPENDS ${_gmoFiles}) +add_custom_target (aw_pofiles ALL DEPENDS ${_gmoFiles}) diff --git a/sources/translations/desktop-panel/CMakeLists.txt b/sources/translations/desktop-panel/CMakeLists.txt index f5df91e..2880a63 100644 --- a/sources/translations/desktop-panel/CMakeLists.txt +++ b/sources/translations/desktop-panel/CMakeLists.txt @@ -19,4 +19,4 @@ foreach (_current_PO_FILE ${_po_files}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/ RENAME ${MO_NAME}) list (APPEND _gmoFiles ${_gmoFile}) endforeach (_current_PO_FILE) -add_custom_target (pofiles ALL DEPENDS ${_gmoFiles}) +add_custom_target (dp_pofiles ALL DEPENDS ${_gmoFiles})