diff options
| author | Christian Tismer <tismer@stackless.com> | 2017-04-22 16:43:25 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2017-04-28 12:21:38 +0000 |
| commit | 7d1307d6d954380b1181309ecc73f1e3a2f8e003 (patch) | |
| tree | 4f44a5bb4c7a58282dea8a0972c3a433d92d990f /PySide2 | |
| parent | 04457b7c819b325ace3311f3f5f6189f4bd9d5da (diff) | |
Support Gentoo’s minimalism: Optional Modules
It has been reported that Gentoo is quite minimalistic and adheres strictly
to Qt5’s definition of optional modules.
Because I once used the Qt5 essential modules as the minimum
requirement, the Gentoo maintainers had to always patch out makefiles
This patch removes this restriction.
But instead simply removing, I added an option “essential” to the
‘CHECK_PACKAGE_FOUND’ macro. When an essential module is omitted,
the macro generates a warning that maybe not all tests are working.
This way, we don’t have to check all tests at once for missing imports.
Update: application_test now correctly moved.
Explicit warning for essential modules.
Corrections, tested with QtCore, only.
Task-number: PYSIDE-502
Change-Id: I6e63c74c80173e0f4bcb5100458b37963f71e4f9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'PySide2')
| -rw-r--r-- | PySide2/CMakeLists.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/PySide2/CMakeLists.txt b/PySide2/CMakeLists.txt index db602c0e..8679929e 100644 --- a/PySide2/CMakeLists.txt +++ b/PySide2/CMakeLists.txt @@ -54,6 +54,9 @@ macro(CHECK_PACKAGE_FOUND name) else() if("${ARGN}" STREQUAL "opt") message(STATUS "optional module ${name} skipped") + elseif("${ARGN}" STREQUAL "essential") + message(STATUS "skipped optional module ${name} is essential!\n" + " We do not guarantee that all tests are working.") else() message(FATAL_ERROR "module ${name} MISSING") endif() @@ -116,19 +119,18 @@ macro(skip_missing_classes sources) endmacro() CHECK_PACKAGE_FOUND(Qt5Core) -CHECK_PACKAGE_FOUND(Qt5Concurrent) -CHECK_PACKAGE_FOUND(Qt5Gui) -CHECK_PACKAGE_FOUND(Qt5Widgets) -CHECK_PACKAGE_FOUND(Qt5PrintSupport) +CHECK_PACKAGE_FOUND(Qt5Concurrent essential) +CHECK_PACKAGE_FOUND(Qt5Gui essential) +CHECK_PACKAGE_FOUND(Qt5Widgets essential) +CHECK_PACKAGE_FOUND(Qt5PrintSupport essential) CHECK_PACKAGE_FOUND(Qt5Xml) CHECK_PACKAGE_FOUND(Qt5XmlPatterns opt) CHECK_PACKAGE_FOUND(Qt5Svg opt) -CHECK_PACKAGE_FOUND(Qt5PrintSupport) -CHECK_PACKAGE_FOUND(Qt5Sql) +CHECK_PACKAGE_FOUND(Qt5Sql essential) CHECK_PACKAGE_FOUND(Qt5Designer opt) CHECK_PACKAGE_FOUND(Qt5UiTools opt) -CHECK_PACKAGE_FOUND(Qt5Test) -CHECK_PACKAGE_FOUND(Qt5Network) +CHECK_PACKAGE_FOUND(Qt5Test essential) +CHECK_PACKAGE_FOUND(Qt5Network essential) CHECK_PACKAGE_FOUND(Qt5WebKit opt) CHECK_PACKAGE_FOUND(Qt5WebKitWidgets opt) CHECK_PACKAGE_FOUND(Qt5Script opt) |