AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Remove old 3rdparty mechanism for harfbuzz-non-ng

Browse Source 
Change-Id: I37c1e561ac83c51a06aae50ccb176094785d52f5
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2020-03-06 17:49:39 +01:00
parent 729a73a9cf
commit 02f08d5038
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/3rdparty/CMakeLists.txt vendored
View File

@ -1,6 +1,5 @@
# special case skip regeneration # special case skip regeneration
# The file is maintained manually # The file is maintained manually
add_subdirectory(harfbuzz)
if(QT_FEATURE_png AND NOT QT_FEATURE_system_png) if(QT_FEATURE_png AND NOT QT_FEATURE_system_png)
add_subdirectory(libpng) add_subdirectory(libpng)

14
src/3rdparty/harfbuzz/CMakeLists.txt vendored
View File

@ -1,14 +0,0 @@
add_library(QtHarfBuzz STATIC
src/harfbuzz-shaper-all.cpp
src/harfbuzz-buffer.c
src/harfbuzz-gdef.c
src/harfbuzz-gsub.c
src/harfbuzz-gpos.c
src/harfbuzz-impl.c
src/harfbuzz-open.c
src/harfbuzz-stream.c
)
target_include_directories(QtHarfBuzz PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
qt_install_3rdparty_library(QtHarfBuzz)

15
src/corelib/CMakeLists.txt
View File

@ -25,7 +25,15 @@ qt_add_module(Core
QMAKE_MODULE_CONFIG moc resources QMAKE_MODULE_CONFIG moc resources
EXCEPTIONS EXCEPTIONS
SOURCES SOURCES
# special case: remove ../3rdparty/harfbuzz ../3rdparty/harfbuzz/src/harfbuzz.h
../3rdparty/harfbuzz/src/harfbuzz-buffer.c
../3rdparty/harfbuzz/src/harfbuzz-gdef.c
../3rdparty/harfbuzz/src/harfbuzz-gpos.c
../3rdparty/harfbuzz/src/harfbuzz-gsub.c
../3rdparty/harfbuzz/src/harfbuzz-impl.c
../3rdparty/harfbuzz/src/harfbuzz-open.c
../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp
../3rdparty/harfbuzz/src/harfbuzz-stream.c
codecs/qtextcodec_p.h codecs/qtextcodec_p.h
codecs/qutfcodec.cpp codecs/qutfcodec_p.h codecs/qutfcodec.cpp codecs/qutfcodec_p.h
global/archdetect.cpp global/archdetect.cpp
@ -238,6 +246,10 @@ qt_add_module(Core
QT_NO_USING_NAMESPACE QT_NO_USING_NAMESPACE
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
"${CMAKE_CURRENT_BINARY_DIR}/global" # special case "${CMAKE_CURRENT_BINARY_DIR}/global" # special case
../3rdparty/harfbuzz/src
# ../3rdparty/md4 # special case remove
# ../3rdparty/md5 # special case remove
# ../3rdparty/sha3 # special case remove
../3rdparty/tinycbor/src ../3rdparty/tinycbor/src
PRECOMPILED_HEADER PRECOMPILED_HEADER
global/qt_pch.h global/qt_pch.h
@ -245,7 +257,6 @@ qt_add_module(Core
"text/qstring_compat.cpp" "text/qstring_compat.cpp"
LIBRARIES LIBRARIES
Qt::GlobalConfigPrivate # special case Qt::GlobalConfigPrivate # special case
QtHarfBuzz # special case
Threads::Threads # special case Threads::Threads # special case
PUBLIC_LIBRARIES # special case: PUBLIC_LIBRARIES # special case:
Qt::Platform # special case: Qt::Platform # special case:

4
src/gui/configure.cmake
View File

@ -6,6 +6,10 @@
set(INPUT_freetype "undefined" CACHE STRING "") set(INPUT_freetype "undefined" CACHE STRING "")
set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system) set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system)
# input harfbuzz
set(INPUT_harfbuzz "undefined" CACHE STRING "")
set_property(CACHE INPUT_harfbuzz PROPERTY STRINGS undefined no qt system)
# input libjpeg # input libjpeg
set(INPUT_libjpeg "undefined" CACHE STRING "") set(INPUT_libjpeg "undefined" CACHE STRING "")
set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system) set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system)

1
util/cmake/configurejson2cmake.py
View File

@ -412,7 +412,6 @@ def parseInput(ctx, sinput, data, cm_fh):
"gcov", "gcov",
"gnumake", "gnumake",
"gui", "gui",
"harfbuzz",
"headersclean", "headersclean",
"incredibuild-xge", "incredibuild-xge",
"libudev", "libudev",