From cc3743a57952aaa604ddd7dc22a00c80d6a9d8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Thu, 17 Nov 2022 09:06:45 +0200 Subject: [PATCH] Add find package for lttng library so that it gets added to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add it globally so that each module using tracepoints don't have to add it themselves to each modules configure.cmake. Change-Id: Id58cfaff5cd715b2667da2470001d646117f9f28 Reviewed-by: Tomi Korpipää Reviewed-by: Jörg Bornemann (cherry picked from commit bab65d70dcaf08e85113d5203056a4b8dd2c1fa7) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++ configure.cmake | 2 ++ src/corelib/configure.cmake | 2 -- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 5be59ed54e0..9d8df960d23 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -577,6 +577,10 @@ macro(qt_build_repo_impl_src) add_subdirectory(src) endif() endif() + if(QT_FEATURE_lttng AND NOT TARGET LTTng::UST) + qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST + MODULE_NAME global QMAKE_LIB lttng-ust) + endif() endmacro() macro(qt_build_repo_impl_tools) diff --git a/configure.cmake b/configure.cmake index 776299189bd..07a0b1836df 100644 --- a/configure.cmake +++ b/configure.cmake @@ -109,6 +109,8 @@ SSL_free(SSL_new(0)); qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME global QMAKE_LIB zstd) qt_find_package(WrapDBus1 1.2 PROVIDED_TARGETS dbus-1 MODULE_NAME global QMAKE_LIB dbus) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev MODULE_NAME global QMAKE_LIB libudev) +qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME core QMAKE_LIB lttng-ust) +qt_add_qmake_lib_dependency(lttng-ust libdl) #### Early-evaluated, Linker-related Tests and Features diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index c7e6a0044ed..14ea626def0 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -34,8 +34,6 @@ qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd MODULE_NAME co qt_find_package(WrapAtomic PROVIDED_TARGETS WrapAtomic::WrapAtomic MODULE_NAME core QMAKE_LIB libatomic) qt_find_package(Libb2 PROVIDED_TARGETS Libb2::Libb2 MODULE_NAME core QMAKE_LIB libb2) qt_find_package(WrapRt PROVIDED_TARGETS WrapRt::WrapRt MODULE_NAME core QMAKE_LIB librt) -qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST MODULE_NAME core QMAKE_LIB lttng-ust) -qt_add_qmake_lib_dependency(lttng-ust libdl) qt_find_package(WrapSystemPCRE2 10.20 PROVIDED_TARGETS WrapSystemPCRE2::WrapSystemPCRE2 MODULE_NAME core QMAKE_LIB pcre2) set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED) if((QNX) OR QT_FIND_ALL_PACKAGES_ALWAYS)