Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: deal with TODO related to CMP0005

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-08 01:55:36 +03:00
parent e0edbc97c4
commit f5fe6558ca
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/modules/FindKDE4Internal.cmake
View file

@ -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()

4
solid/tests/CMakeLists.txt
View file

@ -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}