diff options
| author | David Faure <faure@kde.org> | 2020-03-29 23:08:12 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2020-04-05 17:15:43 +0200 |
| commit | 907d46e0d244f445b675b4f301654b73b27f2a9c (patch) | |
| tree | a9b5d5f91ea0640124cb55b312dcc0197fff1996 /tests | |
| parent | 6136a974262684847746c0bdc980163cbe326eaa (diff) | |
| download | extra-cmake-modules-907d46e0d244f445b675b4f301654b73b27f2a9c.tar.gz extra-cmake-modules-907d46e0d244f445b675b4f301654b73b27f2a9c.tar.bz2 | |
ECM: attempt to fix KDEInstallDirsTest.relative_or_absolute on Windows
Summary:
Not passing CMAKE_INSTALL_PREFIX is a weird thing to do. The test shows
"Installing in ." and some values like KDE_INSTALL_FULL_EXECROOTDIR
become "/" which is considered relative on Windows.
The test that passes /usr to CMAKE_INSTALL_PREFIX actually passes on
Windows. Pass /tmp to the other test, remove the test without prefix.
Test Plan: Passes on Linux, not tested on Windows, CI will do that
Reviewers: kossebau, apol, cgiboudeaux
Reviewed By: apol
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D28409
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 72ae57dc..39771939 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -114,7 +114,6 @@ add_test_macro(ExecuteCoreModules dummy) add_test_macro(ExecuteKDEModules dummy) add_test_macro(KDEFetchTranslations dummy) -add_test_macro(KDEInstallDirsTest.relative_or_absolute dummy) add_test_variant(KDEInstallDirsTest.vars_in_sync_no_args KDEInstallDirsTest.vars_in_sync dummy) add_test_macro(KDEInstallDirsTest.not_cache_variable dummy) @@ -155,7 +154,8 @@ add_test_variant(KDEInstallDirsTest.relative_or_absolute_usr if (TARGET Qt5::qmake) set(KDEInstallDirsTest.relative_or_absolute_qt_EXTRA_OPTIONS - --build-options -DKDE_INSTALL_USE_QT_SYS_PATHS=TRUE + --build-options -DCMAKE_INSTALL_PREFIX=/tmp + -DKDE_INSTALL_USE_QT_SYS_PATHS=TRUE -DPLUGINDIR_should_be_absolute=TRUE -DQMLDIR_should_be_absolute=TRUE -DQTQCHDIR_should_be_absolute=TRUE |