| 1 |
diff --git a/cmake/FindExpat.cmake b/cmake/FindExpat.cmake |
| 2 |
new file mode 100644 |
| 3 |
index 0000000000..cdba26e72e |
| 4 |
--- /dev/null |
| 5 |
+++ b/cmake/FindExpat.cmake |
| 6 |
@@ -0,0 +1,9 @@ |
| 7 |
+set(Expat_FOUND 0) |
| 8 |
+ |
| 9 |
+find_package(PkgConfig QUIET) |
| 10 |
+ |
| 11 |
+pkg_check_modules(EXPAT expat IMPORTED_TARGET) |
| 12 |
+ |
| 13 |
+if(TARGET PkgConfig::EXPAT) |
| 14 |
+ set(Expat_FOUND 1) |
| 15 |
+endif() |
| 16 |
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt |
| 17 |
index b29be1a768..7446d7b1ae 100644 |
| 18 |
--- a/src/gui/CMakeLists.txt |
| 19 |
+++ b/src/gui/CMakeLists.txt |
| 20 |
@@ -673,6 +673,14 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_cssparser |
| 21 |
text/qcssparser.cpp text/qcssparser_p.h |
| 22 |
) |
| 23 |
|
| 24 |
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE |
| 25 |
+ SOURCES |
| 26 |
+ text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h |
| 27 |
+ text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h |
| 28 |
+ LIBRARIES |
| 29 |
+ Fontconfig::Fontconfig |
| 30 |
+) |
| 31 |
+ |
| 32 |
qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype |
| 33 |
SOURCES |
| 34 |
text/freetype/qfontengine_ft.cpp text/freetype/qfontengine_ft_p.h |
| 35 |
@@ -681,17 +689,14 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_freetype |
| 36 |
WrapFreetype::WrapFreetype |
| 37 |
) |
| 38 |
|
| 39 |
-qt_internal_extend_target(Gui CONDITION UNIX AND NOT APPLE |
| 40 |
- SOURCES |
| 41 |
- text/unix/qgenericunixfontdatabase_p.h |
| 42 |
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND UNIX AND NOT APPLE |
| 43 |
+ LIBRARIES |
| 44 |
+ PkgConfig::EXPAT |
| 45 |
) |
| 46 |
|
| 47 |
-qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE |
| 48 |
+qt_internal_extend_target(Gui CONDITION UNIX AND NOT APPLE |
| 49 |
SOURCES |
| 50 |
- text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h |
| 51 |
- text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h |
| 52 |
- LIBRARIES |
| 53 |
- Fontconfig::Fontconfig |
| 54 |
+ text/unix/qgenericunixfontdatabase_p.h |
| 55 |
) |
| 56 |
|
| 57 |
qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS |
| 58 |
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake |
| 59 |
index d8319c120b..1ff24eebaf 100644 |
| 60 |
--- a/src/gui/configure.cmake |
| 61 |
+++ b/src/gui/configure.cmake |
| 62 |
@@ -43,6 +43,7 @@ if(QT_FEATURE_system_zlib) |
| 63 |
qt_add_qmake_lib_dependency(freetype zlib) |
| 64 |
endif() |
| 65 |
qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig) |
| 66 |
+qt_find_package(Expat PROVIDED_TARGETS PkgConfig::EXPAT MODULE_NAME gui QMAKE_LIB expat) |
| 67 |
qt_add_qmake_lib_dependency(fontconfig freetype) |
| 68 |
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm) |
| 69 |
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz) |
| 70 |
-- |
| 71 |
2.41.0 |
| 72 |
|