From c9acb0bdcdcc42045ea54ff79069be5359898fc7 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 29 Jul 2015 23:59:42 +0300 Subject: [PATCH] edit build, create a separate cmake include file --- create_archive.sh | 9 -------- sources/.kdev4/awesomewidgets.kdev4 | 2 +- sources/CMakeLists.txt | 1 + sources/awesome-widget/CMakeLists.txt | 10 --------- .../package/contents/ui/main.qml | 4 +++- sources/awesome-widget/plugin/CMakeLists.txt | 8 ------- sources/desktop-panel/CMakeLists.txt | 10 --------- sources/desktop-panel/plugin/CMakeLists.txt | 13 ------------ sources/extsysmon/CMakeLists.txt | 21 ++----------------- sources/extsysmon/extsysmon.cpp | 1 - sources/libraries.cmake | 18 ++++++++++++++++ 11 files changed, 25 insertions(+), 72 deletions(-) create mode 100644 sources/libraries.cmake diff --git a/create_archive.sh b/create_archive.sh index 0cf2d44..65285c2 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -9,15 +9,6 @@ VERSION="${MAJOR}.${MINOR}.${PATCH}" # update submodules git submodule update --init --recursive -# build dataengine -ARCHIVE="extsysmon" -# create archive -[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f ${ARCHIVE}-${VERSION}-src.tar.xz -[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}" -cp -r "${SRCDIR}/${ARCHIVE}" "${ARCHIVE}" -tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}" -rm -rf "${ARCHIVE}" - # build widget ARCHIVE="awesome-widgets" FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING" diff --git a/sources/.kdev4/awesomewidgets.kdev4 b/sources/.kdev4/awesomewidgets.kdev4 index ea73c1d..b97529b 100644 --- a/sources/.kdev4/awesomewidgets.kdev4 +++ b/sources/.kdev4/awesomewidgets.kdev4 @@ -8,7 +8,7 @@ ProjectRootRelative=./ [CMake][CMake Build Directory 0] Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build -Build Type=Release +Build Type=Debug CMake Binary=file:///usr/bin/cmake Environment Profile= Extra Arguments= diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index fe6520f..fe99979 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -46,6 +46,7 @@ endif () configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) set (PROJECT_LIBRARY awesomewidgets) +include (libraries.cmake) add_subdirectory (awesomewidgets) add_subdirectory (extsysmon) diff --git a/sources/awesome-widget/CMakeLists.txt b/sources/awesome-widget/CMakeLists.txt index 54e4dbe..033ae2d 100644 --- a/sources/awesome-widget/CMakeLists.txt +++ b/sources/awesome-widget/CMakeLists.txt @@ -5,15 +5,5 @@ 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}) - -find_package (Qt5 REQUIRED COMPONENTS Core Network Qml) -find_package (KF5 REQUIRED COMPONENTS I18n Notifications Plasma) - -include (KDEInstallDirs) -include (KDECMakeSettings) -include (KDECompilerSettings) - add_subdirectory (plugin) plasma_install_package (package org.kde.plasma.awesomewidget) diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml index 9c13b6e..d459f25 100644 --- a/sources/awesome-widget/package/contents/ui/main.qml +++ b/sources/awesome-widget/package/contents/ui/main.qml @@ -62,7 +62,9 @@ Item { "downTooltipColor": plasmoid.configuration.downTooltipColor, "upTooltipColor": plasmoid.configuration.upTooltipColor, "batTooltipColor": plasmoid.configuration.batTooltipColor, - "batInTooltipColor": plasmoid.configuration.batInTooltipColor + "batInTooltipColor": plasmoid.configuration.batInTooltipColor, + // additinal field to parse AC status + "acOnline": plasmoid.configuration.acOnline } signal dropSource(string sourceName) diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt index b287ee4..6e6ff57 100644 --- a/sources/awesome-widget/plugin/CMakeLists.txt +++ b/sources/awesome-widget/plugin/CMakeLists.txt @@ -1,14 +1,6 @@ set (PLUGIN_NAME awplugin) add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\") -add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS}) -set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Qml_INCLUDE_DIRS}) -set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Qml_LIBRARIES}) -set (Kf5_INCLUDE ${I18n_INCLUDE_DIR} - ${Notifications_INCLUDE_DIR}) -set (Kf5_LIBRARIES KF5::I18n - KF5::Notifications) - include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sources/desktop-panel/CMakeLists.txt b/sources/desktop-panel/CMakeLists.txt index 52810f7..c9e2e45 100644 --- a/sources/desktop-panel/CMakeLists.txt +++ b/sources/desktop-panel/CMakeLists.txt @@ -5,15 +5,5 @@ 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}) - -find_package (Qt5 REQUIRED COMPONENTS Core Qml) -find_package (KF5 REQUIRED COMPONENTS I18n Notifications Plasma Service WindowSystem) - -include (KDEInstallDirs) -include (KDECMakeSettings) -include (KDECompilerSettings) - add_subdirectory (plugin) plasma_install_package (package org.kde.plasma.desktoppanel) diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt index b8bd506..80e3589 100644 --- a/sources/desktop-panel/plugin/CMakeLists.txt +++ b/sources/desktop-panel/plugin/CMakeLists.txt @@ -1,19 +1,6 @@ set (PLUGIN_NAME dpplugin) add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel\") -add_definitions (${Qt5Core_DEFINITIONS}) -set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} - ${Qt5Qml_INCLUDE_DIRS}) -set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} - ${Qt5Qml_LIBRARIES}) -set (Kf5_INCLUDE ${I18n_INCLUDE_DIR} - ${Notifications_INCLUDE_DIR} - ${Plasma_INCLUDE_DIR}) -set (Kf5_LIBRARIES KF5::I18n - KF5::Notifications - KF5::Plasma - KF5::WindowSystem) - include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt index b629c58..082dfc5 100644 --- a/sources/extsysmon/CMakeLists.txt +++ b/sources/extsysmon/CMakeLists.txt @@ -4,22 +4,6 @@ set (PLUGIN_NAME ${SUBPROJECT}) message (STATUS "Subproject ${SUBPROJECT}") add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\") -# find required libaries -find_package (Qt5 REQUIRED COMPONENTS DBus Network) -find_package (ECM 0.0.11 REQUIRED NO_MODULE) -set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package (KF5 REQUIRED COMPONENTS Plasma Service WindowSystem) - -include (KDEInstallDirs) -include (KDECMakeSettings) -include (KDECompilerSettings) - -add_definitions (${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} - ${Qt5Network_DEFINITIONS}) -set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} - ${Qt5Network_INCLUDE_DIRS}) -set (KDE_INCLUDE ${Plasma_INCLUDE_DIR}) - include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -27,7 +11,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${KDE_INCLUDE}) + ${Kf5_INCLUDE}) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) @@ -42,8 +26,7 @@ configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJEC qt5_wrap_cpp (TASK_MOC_SOURCE ${TASK_HEADER}) qt5_wrap_ui (SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) add_library (${PLUGIN_NAME} MODULE ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER} ${TASK_MOC_SOURCE}) -target_link_libraries (${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Plasma_LIBRARIES} KF5::WindowSystem - ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES}) +target_link_libraries (${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) kcoreaddons_desktop_to_json (${PLUGIN_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) # install diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp index 7606be6..84579c7 100644 --- a/sources/extsysmon/extsysmon.cpp +++ b/sources/extsysmon/extsysmon.cpp @@ -15,7 +15,6 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - #include "extsysmon.h" #include diff --git a/sources/libraries.cmake b/sources/libraries.cmake new file mode 100644 index 0000000..70019d4 --- /dev/null +++ b/sources/libraries.cmake @@ -0,0 +1,18 @@ +find_package (Qt5 REQUIRED COMPONENTS Core DBus Network Qml Widgets) +find_package (ECM 0.0.11 REQUIRED NO_MODULE) +set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +find_package (KF5 REQUIRED COMPONENTS I18n Notifications Plasma Service WindowSystem) + +include (KDEInstallDirs) +include (KDECMakeSettings) +include (KDECompilerSettings) + +add_definitions (${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS} + ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) +set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} + ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) +set (Kf5_INCLUDE ${I18n_INCLUDE_DIR} ${Notifications_INCLUDE_DIR} ${Plasma_INCLUDE_DIR}) + +set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES} + ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES}) +set (Kf5_LIBRARIES KF5::I18n KF5::Notifications KF5::Plasma KF5::WindowSystem)