summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-11-05 14:49:53 +0100
committerTobias Hunger <tobias.hunger@qt.io>2018-11-06 15:24:17 +0000
commite11522726bc7f05947e447ae96b85bc1e2d4685c (patch)
tree758fc38a7ea5f546e0f9583176eba1ae3a5fb048 /src/corelib
parentbebbb410301f388af1a85de30e6a05588c3ab4d0 (diff)
CMake: Add FindPPS and use it in src/corelib/configure.cmake
Find the PPS library and use the result PPS_FOUND in configure.cmake where needed. Change-Id: I08d3ace421278dc0ae5c3128d4234e6bca906c05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/CMakeLists.txt2
-rw-r--r--src/corelib/configure.cmake4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index c56b003137..8c8c033859 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -508,7 +508,7 @@ extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
kernel/qppsattributeprivate_p.h
kernel/qppsobject.cpp kernel/qppsobject_p.h
kernel/qppsobjectprivate_p.h
- LIBRARIES pps
+ LIBRARIES PPS::PPS
)
## clock_gettime:
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index a8acac8f81..5770882bc8 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -22,6 +22,8 @@ find_package(WrapRt)
set_package_properties(WrapRt PROPERTIES TYPE OPTIONAL)
find_package(PCRE2)
set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED)
+find_package(PPS)
+set_package_properties(PPS PROPERTIES TYPE OPTIONAL)
#### Tests
@@ -460,7 +462,7 @@ qt_feature("poll_select" PUBLIC PRIVATE
qt_feature_definition("poll_select" "QT_NO_NATIVE_POLL")
qt_feature("qqnx_pps" PRIVATE
LABEL "PPS"
- CONDITION libs.pps OR FIXME
+ CONDITION PPS_FOUND
EMIT_IF QNX
)
qt_feature("renameat2" PRIVATE