aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2020-12-07 16:09:32 +0200
committerCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2020-12-09 09:00:26 +0000
commitf8599614bd9c3aa733ce5d9b3756c74124fdd88f (patch)
tree713b808bb127ff4824fb1a817b003e3e1cf721ef /sources/pyside6
parenta6bd54e3a51654dfe2ad057205ff9f2a51125fd0 (diff)
Fix Qt include dirs in case of framework
Change-Id: I6937f40ebf85e1d2d1be53e63b0eebbaa7cbf0fa Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/CMakeLists.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
index fbb3f4554..cde216f14 100644
--- a/sources/pyside6/CMakeLists.txt
+++ b/sources/pyside6/CMakeLists.txt
@@ -116,12 +116,9 @@ get_target_property(QtCore_is_framework Qt${QT_MAJOR_VERSION}::Core FRAMEWORK)
if (QtCore_is_framework)
# Get the path to the framework dir.
- get_filename_component(QT_FRAMEWORK_INCLUDE_DIR "${QT_INCLUDE_DIR}/../" ABSOLUTE)
+ set(QT_FRAMEWORK_INCLUDE_DIR "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_LIBS}")
message(STATUS "*** QT_FRAMEWORK_INCLUDE_DIR is ${QT_FRAMEWORK_INCLUDE_DIR}")
-
- # QT_INCLUDE_DIR points to the QtCore.framework directory, so we need to adjust this to point
- # to the actual include directory, which has include files for non-framework parts of Qt.
- get_filename_component(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}/../../include" ABSOLUTE)
+ set(QT_INCLUDE_DIR "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_HEADERS}")
endif()
set_cmake_cxx_flags()