aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2022-01-26 21:56:04 +0200
committerAhmad Samir <a.samirh78@gmail.com>2022-02-05 17:33:17 +0200
commit8091fa010fe2e7404e70c5107c395c23a69218a1 (patch)
tree7c97bf940f58064b9e1c1ada6372476230b9406d
parent927eb53580377f9460b8fc10cf3c561a31bde689 (diff)
downloadextra-cmake-modules-8091fa010fe2e7404e70c5107c395c23a69218a1.tar.gz
extra-cmake-modules-8091fa010fe2e7404e70c5107c395c23a69218a1.tar.bz2
Don't run KDEInstallDirsTest.vars_in_sync_oldstyle_arg for KF6v5.91.0-rc1v5.91.0
Since KDEInstallDirs6 explicitly sets KDE_INSTALL_DIRS_NO_DEPRECATED to false.
-rw-r--r--tests/CMakeLists.txt18
1 files 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