diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-08-18 19:07:47 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-08-19 18:43:37 +0200 |
| commit | 12e4b63d2861945c4860fbf7f9751199a1a1bd2e (patch) | |
| tree | fbad8aac215ad05c961129b092ac88d55ebc3687 /cmake/3rdparty | |
| parent | 41800c3c31517aab387962e5b60aaa942ac516e2 (diff) | |
CMake Build: Fix libdrm detection and compilation on QNX
On QNX 7.1 x86drm.h is located under <...>/usr/include/libdrm, unlike
linux where it's present under /usr/include.
find_path would not find it on QNX, and instead get /usr/include from
host, which resulted in a failure to compile.
Task-number: QTBUG-83202
Change-Id: I03d6c2d4dfbe91bb70df0a322e84890bd7c8548a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/3rdparty')
| -rw-r--r-- | cmake/3rdparty/kwin/FindLibdrm.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmake/3rdparty/kwin/FindLibdrm.cmake b/cmake/3rdparty/kwin/FindLibdrm.cmake index 48598e061b..a94e7fbcb6 100644 --- a/cmake/3rdparty/kwin/FindLibdrm.cmake +++ b/cmake/3rdparty/kwin/FindLibdrm.cmake @@ -78,6 +78,8 @@ if(NOT WIN32) xf86drm.h HINTS ${PKG_Libdrm_INCLUDE_DIRS} + PATH_SUFFIXES + libdrm ) find_library(Libdrm_LIBRARY NAMES @@ -103,14 +105,14 @@ if(NOT WIN32) IMPORTED_LOCATION "${Libdrm_LIBRARY}" INTERFACE_COMPILE_OPTIONS "${Libdrm_DEFINITIONS}" INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}" - INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/libdrm" ) - if(EXISTS "${Libdrm_INCLUDE_DIR}/drm") - set_property(TARGET Libdrm::Libdrm APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/drm" - ) - endif() - + foreach(suffix libdrm drm) + if(EXISTS "${Libdrm_INCLUDE_DIR}/${suffix}") + set_property(TARGET Libdrm::Libdrm APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/${suffix}" + ) + endif() + endforeach() endif() mark_as_advanced(Libdrm_LIBRARY Libdrm_INCLUDE_DIR) |