diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-01-12 15:28:49 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-01-15 15:19:00 +0000 |
| commit | 38ca3c64de743e294a95f43a71a79e81ada41851 (patch) | |
| tree | 891cfbfdbc2b798cd89385828a83b06ddbc74750 /sources/pyside2/cmake | |
| parent | c0a4134b3b75a07c6978d5b294236927c4b71cfc (diff) | |
Fix system framework handling on macOS
System framework paths queried from the system clang compiler should
be re-added to libclang via the -iframework command line argument
instead of -F, so that they appear at the bottom of the list
of candidate include search paths. This prevents issues with picking
up incorrect headers, like an installed official package of Qt 4.8.
Also there is no need to use CMAKE_SYSTEM_FRAMEWORK_PATH like in the
5.6 branch because it duplicates the list of includes and also
causes conflicts with the same paths being added as both system
and non-system include paths.
It was necessary in 5.6 branch because the list of include paths was
not queried from the clang compiler.
Change-Id: I04b299fc5bc759842a0ab890a85170f153932e79
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/cmake')
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 2 |
1 files changed, 0 insertions, 2 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() |