From af414bb720c563a26d23936d50bc74e7ebdb93b4 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 2 Feb 2014 04:57:59 +0400 Subject: [PATCH] Small edit of cmakefiles --- PKGBUILD | 2 +- sources/dataengine/CMakeLists.txt | 8 ++------ sources/dataengine/plasma-engine-netctl.desktop | 2 +- sources/gui/src/CMakeLists.txt | 4 +--- sources/plasmoid/CMakeLists.txt | 8 ++------ 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 9d36e83..d9c71be 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=(https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('5ac750e391936a6f3494a819b7b4d0b2') +md5sums=('1faefe9a5491837863b08fcce79accfe') _cmakekeys="-DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) -DBUILD_GUI:BOOL=1 -DBUILD_PLASMOID:BOOL=1 diff --git a/sources/dataengine/CMakeLists.txt b/sources/dataengine/CMakeLists.txt index 46bccbd..798eea9 100644 --- a/sources/dataengine/CMakeLists.txt +++ b/sources/dataengine/CMakeLists.txt @@ -6,12 +6,8 @@ message (STATUS "Subproject ${SUBPROJECT}") find_package (KDE4 REQUIRED) include (KDE4Defaults) -add_definitions (${QT_DEFINITIONS} - ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../) +add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/../) set (PLUGIN_NAME ${SUBPROJECT}) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) diff --git a/sources/dataengine/plasma-engine-netctl.desktop b/sources/dataengine/plasma-engine-netctl.desktop index ed6885d..b62bd1f 100644 --- a/sources/dataengine/plasma-engine-netctl.desktop +++ b/sources/dataengine/plasma-engine-netctl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Netctl DataEngine +Name=Netctl Comment=Data engine for netctl ServiceTypes=Plasma/DataEngine Type=Service diff --git a/sources/gui/src/CMakeLists.txt b/sources/gui/src/CMakeLists.txt index b0a55f1..830e5a5 100644 --- a/sources/gui/src/CMakeLists.txt +++ b/sources/gui/src/CMakeLists.txt @@ -8,9 +8,7 @@ message (STATUS "${SUBPROJECT} Headers: ${HEADERS}") message (STATUS "${SUBPROJECT} Forms: ${FORMS}") # include_path -include_directories (${SUBPROJECT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${SUBPROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) find_package (Qt4 REQUIRED) include (${QT_USE_FILE}) diff --git a/sources/plasmoid/CMakeLists.txt b/sources/plasmoid/CMakeLists.txt index 55b5edb..a6069a1 100644 --- a/sources/plasmoid/CMakeLists.txt +++ b/sources/plasmoid/CMakeLists.txt @@ -6,12 +6,8 @@ message (STATUS "Subproject ${SUBPROJECT}") find_package (KDE4 REQUIRED) include (KDE4Defaults) -add_definitions (${QT_DEFINITIONS} - ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../) +add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/../) # set sources set (PLUGIN_NAME ${SUBPROJECT})