diff options
| author | Friedemann Kleint <[email protected]> | 2017-05-18 16:22:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2017-05-18 16:22:50 +0200 |
| commit | d4112e4a6ea25aee831da3cd123f139b5f7229bf (patch) | |
| tree | 9df72769796e5c4a1f64c1ef52ad2c00e7094a77 /cmake | |
| parent | 352a80482b0afdc1df5acf526e4ada2c0d30b806 (diff) | |
| parent | 3f45ae1bb3ad3ed433780731e87b0bf66558116d (diff) | |
Change-Id: I8eeca2bbbf6662d0bdc9c3ef5f4018d9f4019159
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Macros/PySideModules.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake index f4bfd885..e2a1bdcd 100644 --- a/cmake/Macros/PySideModules.cmake +++ b/cmake/Macros/PySideModules.cmake @@ -69,9 +69,13 @@ macro(create_pyside_module # Contains include directories to pass to shiboken's preprocessor. set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}) + 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_include_dirs ${shiboken_include_dirs} ${CMAKE_SYSTEM_FRAMEWORK_PATH}) + 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() # Transform the path separators into something shiboken understands. @@ -81,6 +85,7 @@ macro(create_pyside_module COMMAND "${SHIBOKEN_BINARY}" ${GENERATOR_EXTRA_FLAGS} ${pyside2_BINARY_DIR}/pyside2_global.h --include-paths=${shiboken_include_dirs} + ${shiboken_framework_include_dirs_option} --typesystem-paths=${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} --output-directory=${CMAKE_CURRENT_BINARY_DIR} --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt |