diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-11 12:34:52 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-18 15:34:52 +0000 |
commit | 3f03917b54ace1041f7a640dc65b452b0275fafc (patch) | |
tree | cdeed63c0b1afcd906e07352b6e829fbaa9d7133 /src/platformsupport/fontdatabases/CMakeLists.txt | |
parent | 4f1a155909dfcba7353ebe9eee669d65336bd943 (diff) |
Fix Windows build
- Fix qmake build
- Fix QtNetwork moc-ing, by including the moc files
inside the cpp files
- Fix sql odbc plugin by including QT_PLUGIN define
- Fix Boostrap to link against the Platform target, to get the
correct Unicode and WIN64 defines.
- Fix vulkan headers to be found
- Fix freetype bzip and png unresolved symbols / linker issues
when building minimal platform plugin (also need to make
sure to use the vcpkg toolchain instead of CMAKE_PREFIX_PATH
because then find_package is overridden, which does magic
to properly propagate static library dependencies).
- Fix qfilesystementry test not to be built without private
tests feature (it led to undefined symbols issues).
- Make sure to remove QT_NO_CAST_TO_ASCII define when building
QtCore, so that the qstringbuilder3 test builds
successfully.
Task-number: QTBUG-74140
Change-Id: I353d08392b604d55f8e62cdd8696d1e19a3c084a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/CMakeLists.txt')
-rw-r--r-- | src/platformsupport/fontdatabases/CMakeLists.txt | 119 |
1 files changed, 61 insertions, 58 deletions
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 7033af1737..4a410e0c01 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -1,30 +1,26 @@ # Generated from fontdatabases.pro. ##################################################################### -## QtFontDatabaseSupport Module: +## FontDatabaseSupport Module: ##################################################################### -find_package(Freetype) -find_library(FWCoreGraphics CoreGraphics) -find_library(FWCoreFoundation CoreFoundation) -find_library(FWCoreText CoreText) -find_library(FWFoundation Foundation) -find_library(FWAppKit AppKit) +find_package(Freetype) # Special case add_qt_module(FontDatabaseSupport STATIC - SOURCES fake.cpp DEFINES QT_NO_CAST_FROM_ASCII LIBRARIES Qt::CorePrivate Qt::GuiPrivate + # CONFIG = "static" "internal_module" + # MODULE = "fontdatabase_support" + # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" + # _LOADED = "qt_module" ) -set_source_files_properties(fake.cpp PROPERTIES - SKIP_AUTOMOC ON - SKIP_AUTOUIC ON - SKIP_AUTORCC ON -) + +## Scopes: +##################################################################### extend_target(FontDatabaseSupport CONDITION APPLE SOURCES @@ -35,7 +31,9 @@ extend_target(FontDatabaseSupport CONDITION APPLE ${FWCoreGraphics} ${FWCoreText} ${FWFoundation} - ${FWAppKit} + ${FWAppKit} # Special case + + # CONFIG = "watchos_coretext" ) extend_target(FontDatabaseSupport CONDITION APPLE AND QT_FEATURE_freetype @@ -58,7 +56,7 @@ extend_target(FontDatabaseSupport CONDITION UNIX genericunix/qgenericunixfontdatabase_p.h ) -extend_target(FontDatabaseSupport CONDITION UNIX AND QT_FEATURE_fontconfig +extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX SOURCES fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h @@ -66,46 +64,51 @@ extend_target(FontDatabaseSupport CONDITION UNIX AND QT_FEATURE_fontconfig fontconfig ) -#extend_target(FontDatabaseSupport CONDITION WIN32 -#) - -#extend_target(FontDatabaseSupport CONDITION (WIN32) AND (NOT WINRT) -# SOURCES -# qwindowsfontdatabase.cpp qwindowsfontdatabase_p.h -# qwindowsfontengine.cpp qwindowsfontengine_p.h -# qwindowsnativeimage.cpp qwindowsnativeimage_p.h -# LIBRARIES -# Qt::GuiPrivate -#) - -#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_freetype) -# SOURCES -# qwindowsfontdatabase_ft.cpp qwindowsfontdatabase_ft_p.h -#) - -#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_directwrite) -# SOURCES -# qwindowsfontenginedirectwrite.cpp qwindowsfontenginedirectwrite_p.h -#) - -#extend_target(FontDatabaseSupport CONDITION (((WIN32) AND (NOT WINRT)) AND (QT_FEATURE_directwrite)) AND (QT_FEATURE_directwrite2) -# DEFINES -# QT_USE_DIRECTWRITE2 -#) - -#extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (NOT QT_FEATURE_directwrite) -# DEFINES -# QT_NO_DIRECTWRITE -#) -## -##extend_target(FontDatabaseSupport CONDITION ((WIN32) AND (NOT WINRT)) AND (mingw) -##) - -#extend_target(FontDatabaseSupport CONDITION WINRT -# SOURCES -# qwinrtfontdatabase.cpp qwinrtfontdatabase_p.h -# DEFINES -# __WRL_NO_DEFAULT_LIB__ -# LIBRARIES -# Qt::GuiPrivate -#) +extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT + SOURCES + windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h + windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h + windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h + LIBRARIES + Qt::GuiPrivate + ole32 + gdi32 + user32 + advapi32 +) + +extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT + SOURCES + windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h +) + +extend_target(FontDatabaseSupport CONDITION QT_FEATURE_directwrite AND WIN32 AND NOT WINRT + SOURCES + windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h +) + +extend_target(FontDatabaseSupport CONDITION QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT + DEFINES + QT_USE_DIRECTWRITE2 +) + +extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT QT_FEATURE_directwrite AND NOT WINRT + DEFINES + QT_NO_DIRECTWRITE +) + +extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT + LIBRARIES + uuid +) + +extend_target(FontDatabaseSupport CONDITION WINRT + SOURCES + winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h + DEFINES + __WRL_NO_DEFAULT_LIB__ + LIBRARIES + Qt::GuiPrivate + ws2_32 + dwrite +) |