diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-15 21:04:20 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-19 22:51:02 -0800 |
| commit | 235173175b64ea4a5571373a4c37c35b4e18d14f (patch) | |
| tree | 48f3d6a82a9582594a21c78463b249966361553b /src/corelib | |
| parent | 09c58614db074b99f327063424e480e9842e1e45 (diff) | |
CMake: reorganize the QT_FEATURE_library portion of CMakeLists.txt
No need to attempt to compile both qelfparser and qmachoparser in all
systems.
Change-Id: Iccb47e5527544b6fbd75fffd16b7ee5a1555a7a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/corelib/plugin/qmachparser.cpp | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index ecadec689b..a14239e9ae 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1013,19 +1013,21 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_stringlistmodel qt_internal_extend_target(Core CONDITION QT_FEATURE_library SOURCES - plugin/qelfparser_p.cpp plugin/qelfparser_p.h plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h - plugin/qmachparser.cpp plugin/qmachparser_p.h ) - -qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 + SOURCES + plugin/qlibrary_win.cpp +) +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND APPLE SOURCES plugin/qlibrary_unix.cpp + plugin/qmachparser.cpp plugin/qmachparser_p.h ) - -qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND WIN32 +qt_internal_extend_target(Core CONDITION QT_FEATURE_library AND UNIX AND NOT APPLE SOURCES - plugin/qlibrary_win.cpp + plugin/qelfparser_p.cpp plugin/qelfparser_p.h + plugin/qlibrary_unix.cpp ) qt_internal_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library diff --git a/src/corelib/plugin/qmachparser.cpp b/src/corelib/plugin/qmachparser.cpp index 82dc4bf1c2..f864f2610e 100644 --- a/src/corelib/plugin/qmachparser.cpp +++ b/src/corelib/plugin/qmachparser.cpp @@ -39,8 +39,6 @@ #include "qmachparser_p.h" -#if defined(Q_OF_MACH_O) - #include <qendian.h> #include <mach-o/loader.h> @@ -213,5 +211,3 @@ QLibraryScanResult QMachOParser::parse(const char *m_s, ulong fdlen, QString *e } QT_END_NAMESPACE - -#endif |