8c2a95dbe2
* Mir starts up and is able to display system settings
* x86_64 only for now, because at least ubuntu-app-test did not build
on aarch64
Based on PureTryOut's work. Getting it to this stage was a huge effort
(as it shows in the package count: 111(!)). See the merge request for
details.
[skip ci]: this won't finish in CI; ollieparanoid made sure that
everything builds for x86_64.
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 2853d23485b8fdbf778d3b8368b87ae76a5da672 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca@z3ntu.xyz>
|
|
Date: Tue, 29 Jan 2019 19:25:24 +0100
|
|
Subject: [PATCH 4/5] Add -qt5 suffix to search for Qt tools
|
|
|
|
---
|
|
cmake/modules/QmlTest.cmake | 4 ++--
|
|
tests/CMakeLists.txt | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cmake/modules/QmlTest.cmake b/cmake/modules/QmlTest.cmake
|
|
index 25a4f6fde..da7e0a3b5 100644
|
|
--- a/cmake/modules/QmlTest.cmake
|
|
+++ b/cmake/modules/QmlTest.cmake
|
|
@@ -114,9 +114,9 @@ endfunction()
|
|
# This function wraps add_executable_test, see below for available arguments.
|
|
|
|
function(add_qml_unittest PATH COMPONENT_NAME)
|
|
- import_executables(qmltestrunner)
|
|
+ import_executables(qmltestrunner-qt5)
|
|
|
|
- add_executable_test(${COMPONENT_NAME} qmltestrunner
|
|
+ add_executable_test(${COMPONENT_NAME} qmltestrunner-qt5
|
|
${ARGN}
|
|
ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
|
|
)
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 65a874083..8a36dec83 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -130,11 +130,11 @@ endfunction()
|
|
if(DEFINED ENV{DEB_BUILD_MULTIARCH})
|
|
set(QDBUSXML2CPP_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp")
|
|
else()
|
|
- FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp)
|
|
+ FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp-qt5)
|
|
endif()
|
|
|
|
if(NOT QDBUSXML2CPP_EXECUTABLE)
|
|
- message(FATAL_ERROR "qdbusxml2cpp not found")
|
|
+ message(FATAL_ERROR "qdbusxml2cpp-qt5 not found")
|
|
endif()
|
|
|
|
install(DIRECTORY data graphics
|
|
--
|
|
2.20.1
|
|
|