2024-05-21 17:02:41 +02:00
|
|
|
From 6412e5a888fa0ad916167c91d73f677afe08d106 Mon Sep 17 00:00:00 2001
|
2021-02-04 18:12:25 +01:00
|
|
|
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
|
2024-04-02 23:14:50 +02:00
|
|
|
index 5770183d88..f3a187449b 100644
|
2021-02-04 18:12:25 +01:00
|
|
|
--- a/tools/CMakeLists.txt
|
|
|
|
|
+++ b/tools/CMakeLists.txt
|
2024-04-02 23:14:50 +02:00
|
|
|
@@ -39,7 +39,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
|
2021-02-04 18:12:25 +01:00
|
|
|
endif()
|
2021-12-01 14:13:03 +01:00
|
|
|
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)
|
2021-02-04 18:12:25 +01:00
|
|
|
add_subdirectory(qmlscene)
|
|
|
|
|
- add_subdirectory(qmltime)
|
|
|
|
|
+ if(NOT CMAKE_CROSSCOMPILING)
|
|
|
|
|
+ add_subdirectory(qmltime)
|
|
|
|
|
+ endif()
|
|
|
|
|
endif()
|
2022-06-14 15:39:42 +02:00
|
|
|
if(QT_BUILD_SHARED_LIBS
|
|
|
|
|
AND QT_FEATURE_process
|
2021-02-04 18:12:25 +01:00
|
|
|
--
|
2024-05-21 17:02:41 +02:00
|
|
|
2.45.1
|
2021-02-04 18:12:25 +01:00
|
|
|
|
