diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-01 17:15:47 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-03 12:35:09 +0000 |
| commit | 2bbe2cdb20cc6ee77bb69a0130cd74a161601861 (patch) | |
| tree | 618e45038b82865c58f5100b272944cda9caf252 /sources | |
| parent | 13874d8c67a4d4b2cca08fb2f4c96173a6c0c512 (diff) | |
PySide2: Run shiboken2 with a single Qt module header
Create a per-module header including pyside2_global.h and the module
header only instead of passing a global header including
all Qt modules. This reduces the amount of code shiboken2
has to parse and minimizes warnings.
Change-Id: If3ab8fdf6cabe17b4add65f1e4a0f2e1464ab164
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index d4bb023a0..e880a3e69 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -230,9 +230,6 @@ macro(COLLECT_MODULE_IF_FOUND shortname) if(${_name_found}) message(STATUS "module ${name} found (${ARGN})") - # Put the module at the end of pyside2_global.h - file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/PySide2/pyside2_global.h.add" - "#include \"Qt${shortname}/Qt${shortname}\"\n") # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) else() diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 601c43ed6..0b8210359 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -30,15 +30,20 @@ else() "${CMAKE_CURRENT_BINARY_DIR}/support/signature/backport_inspect.py" COPYONLY) endif() -# Add the collected includes to the global include -file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h.add" GLOBAL_APPEND) -file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" "${GLOBAL_APPEND}") -file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h.add") - # now compile all modules. +file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" pyside2_global_contents) + foreach(shortname IN LISTS all_module_shortnames) set(name "Qt5${shortname}") HAS_QT_MODULE(${name}_FOUND Qt${shortname}) + + # Create a module header consisting of pyside2_global.h and the module + # include. Note: The contents of pyside2_global.h must be copied instead of + # just #including it since shiboken will otherwise generate an + # #include <pyside2_global.h> for the the type entries originating from it + # (cf AbstractMetaBuilderPrivate::setInclude()). + set(module_header "${CMAKE_CURRENT_BINARY_DIR}/Qt${shortname}_global.h") + file(WRITE ${module_header} "${pyside2_global_contents}\n#include <Qt${shortname}/Qt${shortname}>\n") endforeach() # install diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index c4177a8d7..2f0917f7f 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -83,7 +83,7 @@ macro(create_pyside_module add_custom_command(OUTPUT ${${module_sources}} COMMAND "${SHIBOKEN_BINARY}" ${GENERATOR_EXTRA_FLAGS} - ${pyside2_BINARY_DIR}/pyside2_global.h + "${pyside2_BINARY_DIR}/${module_name}_global.h" --include-paths=${shiboken_include_dirs} ${shiboken_framework_include_dirs_option} --typesystem-paths=${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} |