diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 18:09:46 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 23:22:57 +0200 |
| commit | a97a8fcc1a9b832fee2ed0e01258e1664a3e3e69 (patch) | |
| tree | f8f08841827a7e12a53591cb2ea183a6b3d510e7 /src/platformsupport/fontdatabases | |
| parent | 77771116a4d43e4832494785bc0abde8f3d8fd58 (diff) | |
CMake: Regenerate src/platformsupport
Change-Id: If7b5359c457edee814dc7d3a71cf47ce052e6c5e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/.prev_CMakeLists.txt | 33 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/CMakeLists.txt | 18 |
2 files changed, 15 insertions, 36 deletions
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index b30b04824a..5ac6c097a0 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -22,35 +22,6 @@ qt_add_module(FontDatabaseSupport ## Scopes: ##################################################################### -qt_extend_target(FontDatabaseSupport CONDITION APPLE - SOURCES - mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h - mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h - LIBRARIES - ${FWCoreFoundation} - ${FWCoreGraphics} - ${FWCoreText} - ${FWFoundation} -) - -qt_extend_target(FontDatabaseSupport CONDITION MACOS - LIBRARIES - ${FWAppKit} -) - -qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS - LIBRARIES - ${FWUIKit} -) - -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype - SOURCES - freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h - freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h - LIBRARIES - WrapFreetype::WrapFreetype -) - qt_extend_target(FontDatabaseSupport CONDITION UNIX SOURCES genericunix/qgenericunixfontdatabase_p.h @@ -82,6 +53,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h + LIBRARIES + WrapFreetype::WrapFreetype ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT @@ -118,7 +91,7 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_F QT_NO_DIRECTWRITE ) -qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION MINGW AND WIN32 AND NOT WINRT LIBRARIES uuid ) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 913e9ba14e..32efd33a5f 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -25,11 +25,6 @@ qt_add_module(FontDatabaseSupport ## Scopes: ##################################################################### -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype - LIBRARIES - WrapFreetype::WrapFreetype -) - qt_extend_target(FontDatabaseSupport CONDITION UNIX SOURCES genericunix/qgenericunixfontdatabase_p.h @@ -43,6 +38,15 @@ qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig Fontconfig::Fontconfig ) +# special case begin +if(TARGET WrapFreetype::WrapFreetype) + qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig + LIBRARIES + WrapFreetype::WrapFreetype +) +endif() +# special case end + qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h @@ -61,6 +65,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT SOURCES windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h + LIBRARIES + WrapFreetype::WrapFreetype ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT @@ -97,7 +103,7 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_F QT_NO_DIRECTWRITE ) -qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT +qt_extend_target(FontDatabaseSupport CONDITION MINGW AND WIN32 AND NOT WINRT LIBRARIES uuid ) |