From 8ddda9a0b8eb9b1917e37188d2f7bb09f4dff352 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 8 Apr 2022 01:56:14 +0300 Subject: [PATCH] generic: deal with TODO related to CMP0005 requires: https://github.com/fluxer/kdelibs/commit/f5fe6558caa712ea9d05749903d47d72bfa5538b Signed-off-by: Ivailo Monev --- ksysguard/ksysguardd/CMakeLists.txt | 2 +- plasma/applets/systemtray/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index 0d60555a..221dfc4d 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ ) # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc # otherwise it's necessary to change it. # into kde 3.x it was installed into /etc/ -add_definitions( -DKSYSGUARDDRCFILE="\\"${KDE4_SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" ) +add_definitions( -DKSYSGUARDDRCFILE="${KDE4_SYSCONF_INSTALL_DIR}/ksysguarddrc" ) macro_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS) diff --git a/plasma/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt index 2b00dc9c..0a57e3e5 100644 --- a/plasma/applets/systemtray/CMakeLists.txt +++ b/plasma/applets/systemtray/CMakeLists.txt @@ -2,7 +2,6 @@ project(plasma-systemtray) set(data_install_dir "plasma/packages/org.kde.systemtray") -cmake_policy(SET CMP0005 NEW) add_definitions(-DSYSTEMTRAY_DATA_INSTALL_DIR="${data_install_dir}") set(systemtray_SRCS