summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-09-03 15:36:15 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-09-10 18:06:00 +0200
commit4c8e231568e47edd689c9270f984868468445509 (patch)
treeef871739966da5c79280240b82e6d3e6768862bc
parent2a9ef0ecee3ca843aa3b3f1ddce1d47b8c6eb002 (diff)
CMake: Fix race condition in -trace configured build
qt_create_tracepoints(Core) creates a dependency from Core to Core_tracepoints_header, but the helper library Core_qobject also uses qtcore_tracepoints_p.h and must therefore depend on Core_tracepoints_header too. This amends 5c092c2b401. Change-Id: I0ed51f3ab9accea00f524c170cd319bb8af11df7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--src/corelib/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index fa8d428a97..d7f7f91fe7 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -1249,6 +1249,11 @@ endif()
# special case end
qt_create_tracepoints(Core qtcore.tracepoints)
+# special case begin
+if(TARGET Core_tracepoints_header)
+ add_dependencies(Core_qobject Core_tracepoints_header)
+endif()
+# special case end
qt_add_docs(Core
doc/qtcore.qdocconf
)