diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index c239ac0..53f625e 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -40,6 +40,7 @@ if (BUILD_PLASMOID) set (BUILD_DATAENGINE ON) endif () +add_subdirectory (icons) if (BUILD_GUI) add_subdirectory (gui) endif () @@ -49,5 +50,3 @@ endif () if (BUILD_PLASMOID) add_subdirectory (plasmoid) endif () - -install (FILES netctl-gui.png DESTINATION ls share/pixmaps/netctl-gui.png) diff --git a/sources/dataengine/CMakeLists.txt b/sources/dataengine/CMakeLists.txt index 55773f6..46bccbd 100644 --- a/sources/dataengine/CMakeLists.txt +++ b/sources/dataengine/CMakeLists.txt @@ -1,5 +1,6 @@ # set project name set (SUBPROJECT plasma_engine_netctl) +message (STATUS "Subproject ${SUBPROJECT}") # find required libaries find_package (KDE4 REQUIRED) @@ -13,15 +14,19 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) set (PLUGIN_NAME ${SUBPROJECT}) -file (GLOB SUBPROJECT_DESKTOP *.desktop) +file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) +file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) file (GLOB SUBPROJECT_SOURCE *.cpp) file (GLOB SUBPROJECT_CONF *.conf) +# prepare +configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) + # make kde4_add_plugin (${PLUGIN_NAME} ${SUBPROJECT_SOURCE}) target_link_libraries (${PLUGIN_NAME} ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS}) # install install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR}) -install (FILES ${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) install (FILES ${SUBPROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR}) diff --git a/sources/dataengine/plasma-engine-netctl.desktop b/sources/dataengine/plasma-engine-netctl.desktop index f4affd2..ed6885d 100644 --- a/sources/dataengine/plasma-engine-netctl.desktop +++ b/sources/dataengine/plasma-engine-netctl.desktop @@ -13,7 +13,7 @@ X-Plasma-EngineName=netctl X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=netctl -X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-Version=@PROJECT_VERSION@ X-KDE-PluginInfo-Website=http://arcan1s.github.io/projects/netctlplasmoid X-KDE-PluginInfo-Category=Network X-KDE-PluginInfo-Depends= diff --git a/sources/gui/CMakeLists.txt b/sources/gui/CMakeLists.txt index 67d339a..059cda6 100644 --- a/sources/gui/CMakeLists.txt +++ b/sources/gui/CMakeLists.txt @@ -1,5 +1,7 @@ # set project name set (SUBPROJECT netctl-gui) +message (STATUS "Subproject ${SUBPROJECT}") + # set directories set (SUBPROJECT_BINARY_DIR bin) set (SUBPROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) diff --git a/sources/icons/CMakeLists.txt b/sources/icons/CMakeLists.txt new file mode 100644 index 0000000..1b35153 --- /dev/null +++ b/sources/icons/CMakeLists.txt @@ -0,0 +1,7 @@ +# set project name +set (SUBPROJECT netctl-gui-icons) +message (STATUS "Subproject ${SUBPROJECT}") + +install (FILES network-idle-64x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME netctl-idle.png) +install (FILES network-offline-64x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME netctl-offline.png) +install (FILES network-idle-128-128.png DESTINATION share/pixmaps RENAME netctl-gui.png) diff --git a/sources/plasmoid/CMakeLists.txt b/sources/plasmoid/CMakeLists.txt index bcff5bb..ecd9402 100644 --- a/sources/plasmoid/CMakeLists.txt +++ b/sources/plasmoid/CMakeLists.txt @@ -1,5 +1,6 @@ # set project name set (SUBPROJECT plasma_applet_netctl) +message (STATUS "Subproject ${SUBPROJECT}") # find required libaries find_package (KDE4 REQUIRED) @@ -14,11 +15,15 @@ include_directories (${CMAKE_SOURCE_DIR} # set sources set (PLUGIN_NAME ${SUBPROJECT}) -file (GLOB SUBPROJECT_DESKTOP *.desktop) +file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) +file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) file (GLOB SUBPROJECT_NOTIFY *.notifyrc) file (GLOB SUBPROJECT_SOURCE *.cpp) file (GLOB SUBPROJECT_UI *.ui) +# prepare +configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) + # make kde4_add_ui_files (SUBPROJECT_SOURCE ${SUBPROJECT_UI}) kde4_add_plugin (${PLUGIN_NAME} ${SUBPROJECT_SOURCE}) @@ -26,5 +31,5 @@ target_link_libraries (${PLUGIN_NAME} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}) # install install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR}) -install (FILES ${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${DATA_INSTALL_DIR}/${PLUGIN_NAME}) diff --git a/sources/plasmoid/plasma-applet-netctl.desktop b/sources/plasmoid/plasma-applet-netctl.desktop index 94a6a00..ca4d72a 100644 --- a/sources/plasmoid/plasma-applet-netctl.desktop +++ b/sources/plasmoid/plasma-applet-netctl.desktop @@ -11,7 +11,7 @@ X-KDE-Library=plasma_applet_netctl X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=netctl -X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-Version=@PROJECT_VERSION@ X-KDE-PluginInfo-Website=http://arcan1s.github.io/projects/netctlplasmoid X-KDE-PluginInfo-Category=Network X-KDE-PluginInfo-Depends=