diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-28 14:58:49 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-29 14:31:57 +0000 |
| commit | eb1e7442061e658de7dc80db455326595731f6dd (patch) | |
| tree | ad3f2b2f833327caa7f2987c098d595a3ede4ad4 /src/platformsupport/fontdatabases/CMakeLists.txt | |
| parent | 03a64ab80dd31b0c0963801a3bf929093ddb8c05 (diff) | |
CMake: Re-generate platformsupport/fontdatabases
Change-Id: I20e7043c77fbbbd882d6bf8cb0a05dfb32eb2ede
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/CMakeLists.txt')
| -rw-r--r-- | src/platformsupport/fontdatabases/CMakeLists.txt | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 4a410e0c01..9622000ab5 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -1,11 +1,10 @@ -# Generated from fontdatabases.pro. +find_package(Freetype) # special case +find_package(Fontconfig) # special case ##################################################################### ## FontDatabaseSupport Module: ##################################################################### -find_package(Freetype) # Special case - add_qt_module(FontDatabaseSupport STATIC DEFINES @@ -13,12 +12,14 @@ add_qt_module(FontDatabaseSupport LIBRARIES Qt::CorePrivate Qt::GuiPrivate - # CONFIG = "static" "internal_module" - # MODULE = "fontdatabase_support" - # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" - # _LOADED = "qt_module" ) +#### Keys ignored in scope 1:.:fontdatabases.pro:<NONE>: +# CONFIG = "static" "internal_module" +# MODULE = "fontdatabase_support" +# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" +# _LOADED = "qt_module" + ## Scopes: ##################################################################### @@ -31,11 +32,12 @@ extend_target(FontDatabaseSupport CONDITION APPLE ${FWCoreGraphics} ${FWCoreText} ${FWFoundation} - ${FWAppKit} # Special case - - # CONFIG = "watchos_coretext" + ${FWUIKit} ) +#### Keys ignored in scope 2:.:fontdatabases.pro:APPLE: +# CONFIG = "watchos_coretext" + extend_target(FontDatabaseSupport CONDITION APPLE AND QT_FEATURE_freetype SOURCES freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h @@ -43,6 +45,11 @@ extend_target(FontDatabaseSupport CONDITION APPLE AND QT_FEATURE_freetype Freetype::Freetype ) +extend_target(FontDatabaseSupport CONDITION APPLE_OSX + LIBRARIES + ${FWAppKit} +) + extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype SOURCES freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h @@ -61,7 +68,7 @@ extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h LIBRARIES - fontconfig + Fontconfig::Fontconfig ) extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT @@ -71,10 +78,10 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES Qt::GuiPrivate - ole32 + advapi32 gdi32 + ole32 user32 - advapi32 ) extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT @@ -109,6 +116,6 @@ extend_target(FontDatabaseSupport CONDITION WINRT __WRL_NO_DEFAULT_LIB__ LIBRARIES Qt::GuiPrivate - ws2_32 dwrite + ws2_32 ) |