34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 14a8581cd5451196b809f184b7f75e22a3e056b4 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 5 Feb 2021 02:22:45 +0100
|
|
Subject: [PATCH] Exclude qmltime when cross compiling
|
|
|
|
as the build script would attempt to set the property of a target
|
|
which does not exist (leading to a configuration error).
|
|
|
|
This tool seems not really requird and is already disabled when
|
|
compiling for Android or when compiling static libraries anyways.
|
|
That's likely also why upstream did not notice this problem so far.
|
|
---
|
|
tools/CMakeLists.txt | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
|
index 0d7a7cddc6..45ad0adee7 100644
|
|
--- a/tools/CMakeLists.txt
|
|
+++ b/tools/CMakeLists.txt
|
|
@@ -31,7 +31,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
|
|
endif()
|
|
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems)
|
|
add_subdirectory(qmlscene)
|
|
- add_subdirectory(qmltime)
|
|
+ if(NOT CMAKE_CROSSCOMPILING)
|
|
+ add_subdirectory(qmltime)
|
|
+ endif()
|
|
endif()
|
|
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems)
|
|
add_subdirectory(qmlplugindump)
|
|
--
|
|
2.35.1
|
|
|