From 8091fa010fe2e7404e70c5107c395c23a69218a1 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 26 Jan 2022 21:56:04 +0200 Subject: Don't run KDEInstallDirsTest.vars_in_sync_oldstyle_arg for KF6 Since KDEInstallDirs6 explicitly sets KDE_INSTALL_DIRS_NO_DEPRECATED to false. --- tests/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67d878cb..a540ca6a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -126,13 +126,17 @@ set(KDEInstallDirsTest.vars_in_sync_cmake_arg_EXTRA_OPTIONS add_test_variant(KDEInstallDirsTest.vars_in_sync_cmake_arg KDEInstallDirsTest.vars_in_sync dummy) -set(KDEInstallDirsTest.vars_in_sync_oldstyle_arg_EXTRA_OPTIONS - --build-options -DBIN_INSTALL_DIR=altbin - -DBINDIR_expected_value=altbin - -DCMAKE_WARN_DEPRECATED=TRUE - ) -add_test_variant(KDEInstallDirsTest.vars_in_sync_oldstyle_arg - KDEInstallDirsTest.vars_in_sync dummy) +# KDEInstallDirs6 explicitly sets KDE_INSTALL_DIRS_NO_DEPRECATED to false, +# hence this test makes no sense in that case +if(TARGET Qt5::Core) + set(KDEInstallDirsTest.vars_in_sync_oldstyle_arg_EXTRA_OPTIONS + --build-options -DBIN_INSTALL_DIR=altbin + -DBINDIR_expected_value=altbin + -DCMAKE_WARN_DEPRECATED=TRUE + ) + add_test_variant(KDEInstallDirsTest.vars_in_sync_oldstyle_arg + KDEInstallDirsTest.vars_in_sync dummy) +endif() set(KDEInstallDirsTest.relative_or_absolute_usr_EXTRA_OPTIONS --build-options -DCMAKE_INSTALL_PREFIX=/usr -- cgit v1.2.1