diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 2 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/header_paths.h | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index 62136dce7..83d43976a 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -71,8 +71,6 @@ macro(create_pyside_module set(shiboken_framework_include_dirs_option "") if(CMAKE_HOST_APPLE) set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}") - # On macOS, provide the framework paths for OpenGL headers. - set(shiboken_framework_include_dirs ${shiboken_framework_include_dirs} ${CMAKE_SYSTEM_FRAMEWORK_PATH}) make_path(shiboken_framework_include_dirs ${shiboken_framework_include_dirs}) set(shiboken_framework_include_dirs_option "--framework-include-paths=${shiboken_framework_include_dirs}") endif() diff --git a/sources/shiboken2/ApiExtractor/header_paths.h b/sources/shiboken2/ApiExtractor/header_paths.h index 3bc26efe0..f70709b7c 100644 --- a/sources/shiboken2/ApiExtractor/header_paths.h +++ b/sources/shiboken2/ApiExtractor/header_paths.h @@ -46,12 +46,16 @@ public: { QByteArray option; - if (p.m_isFramework) - option = QByteArrayLiteral("-F"); - else if (systemInclude) + if (p.m_isFramework) { + if (systemInclude) + option = QByteArrayLiteral("-iframework"); + else + option = QByteArrayLiteral("-F"); + } else if (systemInclude) { option = QByteArrayLiteral("-isystem"); - else + } else { option = QByteArrayLiteral("-I"); + } return option + p.path; } |