summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-06 17:49:39 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-10 07:33:13 +0100
commit02f08d50383c7373caefe76d454b59b881fe30e1 (patch)
tree317f480e2fe764581ffe82785091871e061c2261
parent729a73a9cfe774cb49251be8c99ba5b26d516e01 (diff)
CMake: Remove old 3rdparty mechanism for harfbuzz-non-ng
Change-Id: I37c1e561ac83c51a06aae50ccb176094785d52f5 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/3rdparty/CMakeLists.txt1
-rw-r--r--src/3rdparty/harfbuzz/CMakeLists.txt14
-rw-r--r--src/corelib/CMakeLists.txt15
-rw-r--r--src/gui/configure.cmake4
-rwxr-xr-xutil/cmake/configurejson2cmake.py1
5 files changed, 17 insertions, 18 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index c6a5da43ae..d6ef4f3a56 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,6 +1,5 @@
# special case skip regeneration
# The file is maintained manually
-add_subdirectory(harfbuzz)
if(QT_FEATURE_png AND NOT QT_FEATURE_system_png)
add_subdirectory(libpng)
diff --git a/src/3rdparty/harfbuzz/CMakeLists.txt b/src/3rdparty/harfbuzz/CMakeLists.txt
deleted file mode 100644
index 3eaddbb2db..0000000000
--- a/src/3rdparty/harfbuzz/CMakeLists.txt
+++ /dev/null
@@ -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)
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 7dc5cda06c..37079bdc72 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -25,7 +25,15 @@ qt_add_module(Core
QMAKE_MODULE_CONFIG moc resources
EXCEPTIONS
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/qutfcodec.cpp codecs/qutfcodec_p.h
global/archdetect.cpp
@@ -238,6 +246,10 @@ qt_add_module(Core
QT_NO_USING_NAMESPACE
INCLUDE_DIRECTORIES
"${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
PRECOMPILED_HEADER
global/qt_pch.h
@@ -245,7 +257,6 @@ qt_add_module(Core
"text/qstring_compat.cpp"
LIBRARIES
Qt::GlobalConfigPrivate # special case
- QtHarfBuzz # special case
Threads::Threads # special case
PUBLIC_LIBRARIES # special case:
Qt::Platform # special case:
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 07866eff9e..b338cf7dc8 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -6,6 +6,10 @@
set(INPUT_freetype "undefined" CACHE STRING "")
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
set(INPUT_libjpeg "undefined" CACHE STRING "")
set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system)
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 6b68bf15bb..76d6a33477 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -412,7 +412,6 @@ def parseInput(ctx, sinput, data, cm_fh):
"gcov",
"gnumake",
"gui",
- "harfbuzz",
"headersclean",
"incredibuild-xge",
"libudev",