From 495eeac56d822072fecc1c59fabbeb3b1077fd3b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 10 Jul 2020 15:43:24 +0200 Subject: Fix OpenGLFunctions for Qt 6 Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I5b8e95b232812fa90ec5974b2b578eb581c06ace Reviewed-by: Christian Tismer --- sources/cmake_helpers/helpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/cmake_helpers/helpers.cmake') diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index bd67ca933..7ab2a4b71 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -168,7 +168,7 @@ macro(COLLECT_MODULE_IF_FOUND shortname) # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) # Build Qt 5 compatibility variables - if(${QT_MAJOR_VERSION} GREATER_EQUAL 6) + if(${QT_MAJOR_VERSION} GREATER_EQUAL 6 AND NOT "${shortname}" STREQUAL "OpenGLFunctions") get_target_property(Qt6${shortname}_INCLUDE_DIRS Qt6::${shortname} INTERFACE_INCLUDE_DIRECTORIES) get_target_property(Qt6${shortname}_PRIVATE_INCLUDE_DIRS -- cgit v1.2.3