diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-02 14:18:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 07:56:25 +0000 |
| commit | f2063ee4737f90c5d412a9a328672fde32b033eb (patch) | |
| tree | be06749b135fd45a9ca5b0e1d213ef743883dcf5 /sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt | |
| parent | 0de4dffa0c5abc80df7063daf6bc9d1754891a9d (diff) | |
PySide2: Simplify typesystem path handling
Modify the typesystem.xml files such that all dependent files
are loaded via module (for example, QtCore/typesystem_core.xml).
As a result, it is no longer necessary to add each dependent directory
to the typesystem path; it is sufficient to pass the binary and source
path of PySide2 and the source directory of the Qt module only.
This requires rewriting the dependency checking for --reuse-build
so that it loops over the source directories of the dependent
Qt modules.
Change-Id: Ib234c2673f4ee93cc8a3282fac69bcfcfaebd0ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt index b23b20c5f..6c69a784c 100644 --- a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt @@ -9,12 +9,6 @@ ${QtMacExtras_GEN_DIR}/qmactoolbaritem_wrapper.cpp ${QtMacExtras_GEN_DIR}/qtmacextras_module_wrapper.cpp ) -make_path(QtMacExtras_typesystem_path ${QtMacExtras_SOURCE_DIR} - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR}) - set(QtMacExtras_include_dirs ${QtMacExtras_SOURCE_DIR} ${QtMacExtras_BINARY_DIR} ${Qt5MacExtras_INCLUDE_DIRS} @@ -38,6 +32,6 @@ create_pyside_module(QtMacExtras QtMacExtras_include_dirs QtMacExtras_libraries QtMacExtras_deps - QtMacExtras_typesystem_path + QtMacExtras_SOURCE_DIR QtMacExtras_SRC "") |