From 3acebfe6eb9ff0c97ab0e79f9f0b35835a4df57a Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Nov 2018 15:06:25 +0100 Subject: [PATCH] CMake: Add support to find LTTng-ust CMake comes with a Find module for this, so use it in src/corelib/configure.cmake Change-Id: I8f4abcb32fb10513d67c3c959310eefaf7b56d3d Reviewed-by: Frederik Gladhorn --- src/corelib/configure.cmake | 4 +++- util/cmake/configurejson2cmake.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 163a5980eca..a30f8d1bca1 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -20,6 +20,8 @@ find_package(Atomic) set_package_properties(Atomic PROPERTIES TYPE OPTIONAL) find_package(WrapRt) set_package_properties(WrapRt PROPERTIES TYPE OPTIONAL) +find_package(LTTngUST) +set_package_properties(LTTngUST PROPERTIES TYPE OPTIONAL) find_package(PCRE2) set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED) find_package(PPS) @@ -713,7 +715,7 @@ qt_feature("commandlineparser" PUBLIC qt_feature("lttng" PRIVATE LABEL "LTTNG" AUTODETECT OFF - CONDITION LINUX AND libs.lttng-ust OR FIXME + CONDITION LINUX AND LTTNGUST_FOUND ENABLE INPUT_trace STREQUAL 'lttng' OR ( INPUT_trace STREQUAL 'yes' AND LINUX ) DISABLE INPUT_trace STREQUAL 'etw' OR INPUT_trace STREQUAL 'no' ) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index a54a692fac5..ad80146b9f0 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -69,6 +69,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]: 'libproxy': 'libproxy', 'librt': 'WrapRt', 'libudev': 'Libudev', + 'lttng-ust': LibraryMapping(package='LTTngUST', resultVariable="LTTNGUST"), 'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"), 'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False), 'pcre2': ['PCRE2', 'REQUIRED'],