From f5fe6558caa712ea9d05749903d47d72bfa5538b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 8 Apr 2022 01:55:36 +0300 Subject: [PATCH] generic: deal with TODO related to CMP0005 Signed-off-by: Ivailo Monev --- cmake/modules/FindKDE4Internal.cmake | 3 --- solid/tests/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index 02a99016..2f61ae42 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -141,9 +141,6 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) cmake_policy(SET CMP0000 OLD) # CMP0003: add the link paths to the link command as with cmake 2.4 cmake_policy(SET CMP0003 OLD) -# TODO: get rid of this and adjust to new behaviour -# CMP0005: keep escaping behaviour for definitions added via add_definitions() -cmake_policy(SET CMP0005 OLD) if(NOT CMAKE_VERSION VERSION_LESS "3.3.0") cmake_policy(SET CMP0063 NEW) endif() diff --git a/solid/tests/CMakeLists.txt b/solid/tests/CMakeLists.txt index 0777ba84..eecd984e 100644 --- a/solid/tests/CMakeLists.txt +++ b/solid/tests/CMakeLists.txt @@ -20,13 +20,13 @@ target_link_libraries(solid-fakehardwaretest ${QT_QTTEST_LIBRARY} ) -add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"") +add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml") ########### solidhwtest ############### kde4_add_test(solid-solidhwtest solidhwtest.cpp) -add_definitions(-DFAKE_COMPUTER_XML="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"") +add_definitions(-DFAKE_COMPUTER_XML="${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml") target_link_libraries(solid-solidhwtest ${QT_QTCORE_LIBRARY}