1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add support to find LTTng-ust

Browse Source 
CMake comes with a Find module for this, so use it in src/corelib/configure.cmake

Change-Id: I8f4abcb32fb10513d67c3c959310eefaf7b56d3d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Tobias Hunger 2018-11-06 15:06:25 +01:00
parent eb2ece3c59
commit 3acebfe6eb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/configure.cmake
View File

@ -20,6 +20,8 @@ find_package(Atomic)
set_package_properties(Atomic PROPERTIES TYPE OPTIONAL) set_package_properties(Atomic PROPERTIES TYPE OPTIONAL)
find_package(WrapRt) find_package(WrapRt)
set_package_properties(WrapRt PROPERTIES TYPE OPTIONAL) set_package_properties(WrapRt PROPERTIES TYPE OPTIONAL)
find_package(LTTngUST)
set_package_properties(LTTngUST PROPERTIES TYPE OPTIONAL)
find_package(PCRE2) find_package(PCRE2)
set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED) set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED)
find_package(PPS) find_package(PPS)
@ -713,7 +715,7 @@ qt_feature("commandlineparser" PUBLIC
qt_feature("lttng" PRIVATE qt_feature("lttng" PRIVATE
LABEL "LTTNG" LABEL "LTTNG"
AUTODETECT OFF 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 ) ENABLE INPUT_trace STREQUAL 'lttng' OR ( INPUT_trace STREQUAL 'yes' AND LINUX )
DISABLE INPUT_trace STREQUAL 'etw' OR INPUT_trace STREQUAL 'no' DISABLE INPUT_trace STREQUAL 'etw' OR INPUT_trace STREQUAL 'no'
) )

1
util/cmake/configurejson2cmake.py
View File

@ -69,6 +69,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'libproxy': 'libproxy', 'libproxy': 'libproxy',
'librt': 'WrapRt', 'librt': 'WrapRt',
'libudev': 'Libudev', 'libudev': 'Libudev',
'lttng-ust': LibraryMapping(package='LTTngUST', resultVariable="LTTNGUST"),
'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"), 'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"),
'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False), 'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False),
'pcre2': ['PCRE2', 'REQUIRED'], 'pcre2': ['PCRE2', 'REQUIRED'],