edit build, create a separate cmake include file

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"

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=

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)

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)

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)

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}

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)

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}

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
+target_link_libraries (${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
-                       ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES})
 kcoreaddons_desktop_to_json (${PLUGIN_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP})
 
 # install

sources/extsysmon/extsysmon.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "extsysmon.h"
 
 #include <KWindowSystem>

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)