From 75c94ae092a6c2b96c1cd4ef19d4ca2f76ec0d7d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 14 Aug 2021 20:00:27 +0200 Subject: [PATCH] Always look for qpa/qplatformnativeinterface.h --- CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7599cf13..0b317de05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,14 +241,12 @@ if(X11_FOUND) message(WARNING, "Missing X11/XF86keysym.h") endif() - if(BUILD_WITH_QT5 OR (BUILD_WITH_QT6 AND Qt6Core_VERSION VERSION_LESS 6.2.0)) - find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) - if(QPA_QPLATFORMNATIVEINTERFACE_H) - set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON) - message(STATUS "Have qpa/qplatformnativeinterface.h header.") - else() - message(STATUS "Missing qpa/qplatformnativeinterface.h header.") - endif() + find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) + if(QPA_QPLATFORMNATIVEINTERFACE_H) + set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON) + message(STATUS "Have qpa/qplatformnativeinterface.h header.") + else() + message(STATUS "Missing qpa/qplatformnativeinterface.h header.") endif() endif(X11_FOUND)