diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/KDEInstallDirsTest/var_list.cmake | 32 | ||||
| -rw-r--r-- | tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt | 5 |
2 files changed, 28 insertions, 9 deletions
diff --git a/tests/KDEInstallDirsTest/var_list.cmake b/tests/KDEInstallDirsTest/var_list.cmake index a706cef8..4e9178e1 100644 --- a/tests/KDEInstallDirsTest/var_list.cmake +++ b/tests/KDEInstallDirsTest/var_list.cmake @@ -5,7 +5,7 @@ set(var_suffixes CMAKEPACKAGEDIR CONFDIR DATADIR - DATADIR_KF5 + DATADIR_KF DATAROOTDIR DBUSDIR DBUSINTERFACEDIR @@ -16,17 +16,17 @@ set(var_suffixes EXECROOTDIR ICONDIR INCLUDEDIR - INCLUDEDIR_KF5 + INCLUDEDIR_KF INFODIR KCFGDIR KCONFUPDATEDIR - KNOTIFY5RCDIR - KXMLGUI5DIR - KSERVICES5DIR - KSERVICETYPES5DIR + KNOTIFYRCDIR + KXMLGUIDIR + KSERVICESDIR + KSERVICETYPESDIR LIBDIR LIBEXECDIR - LIBEXECDIR_KF5 + LIBEXECDIR_KF LOCALEDIR LOCALSTATEDIR MANDIR @@ -37,7 +37,6 @@ set(var_suffixes QMLDIR QTPLUGINDIR QTQCHDIR - QTQUICKIMPORTSDIR SBINDIR SHAREDSTATEDIR SOUNDDIR @@ -46,6 +45,18 @@ set(var_suffixes SYSTEMDUSERUNITDIR TEMPLATEDIR WALLPAPERDIR) +if (QT_MAJOR_VERSION EQUAL "5") + list(APPEND var_suffixes + DATADIR_KF5 + INCLUDEDIR_KF5 + KNOTIFY5RCDIR + KXMLGUI5DIR + KSERVICES5DIR + KSERVICETYPES5DIR + LIBEXECDIR_KF5 + QTQUICKIMPORTSDIR + ) +endif() if(APPLE) list(APPEND var_suffixes BUNDLEDIR) endif() @@ -128,5 +139,10 @@ else() endforeach() endif() +# newly added version-less vars in 5 do also not set the legacy variables +foreach(suffix DATADIR_KF INCLUDEDIR_KF KNOTIFYRCDIR KXMLGUIDIR KSERVICESDIR KSERVICETYPESDIR LIBEXECDIR_KF) + set(should_set_CMAKE_INSTALL_${suffix} FALSE) +endforeach() + unset(_gnu_install_dirs_suffixes) diff --git a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt index 4db78036..dea61594 100644 --- a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt @@ -26,7 +26,10 @@ foreach(suffix ${var_suffixes}) endif() endforeach() -assert_var_defined(KF5_INSTALL_TARGETS_DEFAULT_ARGS) +assert_var_defined(KF_INSTALL_TARGETS_DEFAULT_ARGS) +if (QT_MAJOR_VERSION EQUAL "5") + assert_var_defined(KF5_INSTALL_TARGETS_DEFAULT_ARGS) +endif() assert_var_defined(KDE_INSTALL_TARGETS_DEFAULT_ARGS) if(NOT KDE_INSTALL_DIRS_NO_CMAKE_VARIABLES AND NOT KDE_INSTALL_DIRS_NO_DEPRECATED) |