diff options
3 files changed, 23 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) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index 6f1d5f6751..61ae1b932a 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -30,3 +30,10 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin #### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>: # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" + +# begin special case +qt_extend_target(QEglFSKmsEglDeviceIntegrationPlugin + CONDITION QNX + COMPILE_OPTIONS -fpermissive +) +# end special case diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index ec11b355af..0090dbb1ee 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -26,3 +26,10 @@ qt_add_module(EglFsKmsSupport Qt::GuiPrivate Qt::KmsSupportPrivate ) + +# begin special case +qt_extend_target(EglFsKmsSupport + CONDITION QNX + COMPILE_OPTIONS -fpermissive +) +# end special case |