diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-09-11 21:00:00 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-09-11 21:00:00 +0100 |
| commit | f8609e8b64fd9170aa1444ad4e2f6d6d759e9050 (patch) | |
| tree | 083c6d46b2d494bd6f8161e523d9dff82dadbc4a /tests/CMakeLists.txt | |
| parent | 6ab50fa9e27c4710beb2641fd510dfce08cc2719 (diff) | |
| download | extra-cmake-modules-f8609e8b64fd9170aa1444ad4e2f6d6d759e9050.tar.gz extra-cmake-modules-f8609e8b64fd9170aa1444ad4e2f6d6d759e9050.tar.bz2 | |
Fix fallout from recent ECM patches
KDE modules cannot assume the normal ECM modules are in the CMake module
path, and CMAKE_INSTALL_IMPORTS_INSTALL_DIR / QTQUICKIMPORTSDIR was not
set correctly. Also, ECMQueryQmake.cmake used a deprecated CMake command
(exec_program).
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 69da6e6e..b8fb3b84 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,8 +29,16 @@ find_package(Qt5LinguistTools CONFIG) add_test_macro(ExecuteCoreModules dummy) add_test_macro(ExecuteKDEModules dummy) + add_test_macro(KDEInstallDirsTest.vars_defined dummy) add_test_macro(KDEInstallDirsTest.not_cache_variable dummy) +find_package(Qt5Core QUIET) +if (TARGET Qt5::qmake) + set(KDEInstallDirsTest.qt_vars_defined_EXTRA_OPTIONS + --build-options -DKDE_INSTALL_USE_QT_SYS_PATHS=ON) + add_test_macro(KDEInstallDirsTest.qt_vars_defined dummy) +endif () + add_test_macro(FindModules dummy) add_test_macro(UseFindModules dummy) |