Fix PySide build using Qt frameworks

Change-Id: I37cae548c2ae451fa8672c9a54a19e929a831f25
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

3 files changed, 47 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d4dc7c..7c5ec97c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,12 +133,22 @@ if(CMAKE_HOST_APPLE)
     endif()
 endif()
 
-if(NOT CMAKE_HOST_APPLE)
-    # Qt5: QT_INCLUDE_DIR does no longer exist.
-    # On Windows and Linux, it can be computed from Qt5Core_INCLUDE_DIRS
-    message("Qt5Core_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS}")
-    list(GET Qt5Core_INCLUDE_DIRS 0 QT_INCLUDE_DIR)
-    message(STATUS "*** computed QT_INCLUDE_DIR as ${QT_INCLUDE_DIR}")
+# Qt5: QT_INCLUDE_DIR does no longer exist.
+# On Windows, macOS, and Linux it can be computed from Qt5Core_INCLUDE_DIRS, which contains
+# a list of include directories. We take the first one.
+message(STATUS "*** Qt5Core_INCLUDE_DIRS = ${Qt5Core_INCLUDE_DIRS}")
+list(GET Qt5Core_INCLUDE_DIRS 0 QT_INCLUDE_DIR)
+
+# On macOS, check if Qt is a framework build. This affects how include paths should be handled.
+get_target_property(QtCore_is_framework Qt5::Core FRAMEWORK)
+
+if (QtCore_is_framework)
+    get_filename_component(QT_FRAMEWORK_INCLUDE_DIR "${QT_INCLUDE_DIR}/../" ABSOLUTE)
+    message(STATUS "*** QT_FRAMEWORK_INCLUDE_DIR is ${QT_FRAMEWORK_INCLUDE_DIR}")
+
+    # QT_INCLUDE_DIR points to the QtCore.framework directory, so need to adjust this to point
+    # to the actual include directory.
+    get_filename_component(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}/../../include" ABSOLUTE)
 endif()
 
 if(MSVC)
@@ -162,12 +172,14 @@ else()
         if (NOT QT_INCLUDE_DIR)
             set(QT_INCLUDE_DIR "/Library/Frameworks")
         endif()
-        if(ALTERNATIVE_QT_INCLUDE_DIR)
+        if(NOT QT_INCLUDE_DIR AND ALTERNATIVE_QT_INCLUDE_DIR)
             set(QT_INCLUDE_DIR ${ALTERNATIVE_QT_INCLUDE_DIR})
         endif()
         string(REPLACE " " ":" QT_INCLUDE_DIR ${QT_INCLUDE_DIR})
     endif()
 endif()
+message(STATUS "*** computed QT_INCLUDE_DIR as ${QT_INCLUDE_DIR}")
+
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE ${SHIBOKEN_BUILD_TYPE})
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
diff --git a/tests/pysidetest/CMakeLists.txt b/tests/pysidetest/CMakeLists.txt
index 3a5437e6..05b0b86b 100644
--- a/tests/pysidetest/CMakeLists.txt
+++ b/tests/pysidetest/CMakeLists.txt
@@ -35,14 +35,32 @@ ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp
 )
 
+# Get per module include dirs.
+# There are usually 3 paths there:
+# ./qt/include/; ./qt/include/QtCore ; ./qt/mkspecs/linux-g++
+# on framework build they are:
+# ./qt/lib/QtCore.framework; ./qt/lib/QtCore.framework/Headers ; ./qt/mkspecs/macx-clang
+# Thus we use the second direct path, which contains the actual header files.
+
+list(GET Qt5Core_INCLUDE_DIRS 1 Qt5Core_DIRECT_INCLUDE_DIR)
+list(GET Qt5Gui_INCLUDE_DIRS 1 Qt5Gui_DIRECT_INCLUDE_DIR)
+list(GET Qt5Widgets_INCLUDE_DIRS 1 Qt5Widgets_DIRECT_INCLUDE_DIR)
+
+# Adjust include headers paths for frameworks.
+set(shiboken_framework_include_dirs_option "")
+if(CMAKE_HOST_APPLE AND QtCore_is_framework)
+    set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
+    set(shiboken_framework_include_dirs_option "--framework-include-paths=${shiboken_framework_include_dirs}")
+endif()
+
 make_path(testbinding_include_dirs  ${pyside2_BINARY_DIR}
                                     ${CMAKE_CURRENT_SOURCE_DIR}
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../PySide2
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../libpyside
                                     ${QT_INCLUDE_DIR}
-                                    ${QT_INCLUDE_DIR}/QtCore
-                                    ${QT_INCLUDE_DIR}/QtGui
-                                    ${QT_INCLUDE_DIR}/QtWidgets
+                                    ${Qt5Core_DIRECT_INCLUDE_DIR}
+                                    ${Qt5Gui_DIRECT_INCLUDE_DIR}
+                                    ${Qt5Widgets_DIRECT_INCLUDE_DIR}
                                     )
 
 make_path(testbinding_typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}
@@ -55,6 +73,7 @@ add_custom_command(OUTPUT ${testbinding_SRC}
 COMMAND ${SHIBOKEN_BINARY} ${GENERATOR_EXTRA_FLAGS}
         ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h
         --include-paths=${testbinding_include_dirs}
+        ${shiboken_framework_include_dirs_option}
         --typesystem-paths=${testbinding_typesystem_path}
         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_pysidetest.xml