remove currently unused HarfBuzz checks during build

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a4c911..c11c40f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,10 +123,6 @@ add_feature_info(dbus WITH_DBUS "build D-Bus support")
 option(WITH_FONTCONFIG "Build Fontconfig support" ON)
 add_feature_info(fontconfig WITH_FONTCONFIG "build Fontconfig support")
 
-# TODO: enable when building against external harfbuzz works
-option(WITH_HARFBUZZ "Build Harfbuzz support" OFF)
-add_feature_info(harfbuzz WITH_HARFBUZZ "build Harfbuzz support")
-
 option(WITH_ODBC "Build ODBC database plugin" ON)
 add_feature_info(odbc WITH_ODBC "build ODBC support")
 
@@ -292,15 +288,6 @@ set_package_properties(Fontconfig PROPERTIES
     TYPE RECOMMENDED
 )
 
-# currently unused
-find_package(HarfBuzz)
-set_package_properties(HarfBuzz PROPERTIES
-    PURPOSE "Currently none"
-    DESCRIPTION "OpenType text shaping engine"
-    URL "https://www.freedesktop.org/wiki/Software/HarfBuzz/"
-    TYPE RECOMMENDED
-)
-
 # v1.5.12+ required for DBusBasicValue type
 find_package(DBus 1.5.12)
 set_package_properties(DBus PROPERTIES

diff --git a/cmake/modules/FindHarfBuzz.cmake b/cmake/modules/FindHarfBuzz.cmake
deleted file mode 100644 (file)
index 854810c..0000000
--- a/cmake/modules/FindHarfBuzz.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# - Try to find HarfBuzz
-# Once done this will define
-#
-#  HARFBUZZ_FOUND - system has HarfBuzz
-#  HARFBUZZ_INCLUDES - the HarfBuzz include directory
-#  HARFBUZZ_LIBRARIES - the libraries needed to use HarfBuzz
-#
-# Copyright (c) 2015-2020, Ivailo Monev, <xakepa10@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-include(FindPkgConfig)
-include(FindPackageHandleStandardArgs)
-
-pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
-
-find_path(HARFBUZZ_INCLUDES
-    NAMES hb.h
-    PATH_SUFFIXES harfbuzz
-    HINTS $ENV{HARFBUZZDIR}/include ${PC_HARFBUZZ_INCLUDEDIR}
-)
-
-find_library(HARFBUZZ_LIBRARIES
-    NAMES harfbuzz
-    HINTS $ENV{HARFBUZZDIR}/lib ${PC_HARFBUZZ_LIBDIR}
-)
-
-find_package_handle_standard_args(HarfBuzz
-    VERSION_VAR PC_HARFBUZZ_VERSION
-    REQUIRED_VARS HARFBUZZ_LIBRARIES HARFBUZZ_INCLUDES
-)
-
-mark_as_advanced(HARFBUZZ_INCLUDES HARFBUZZ_LIBRARIES)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 612ff25..8a9dbef 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -220,6 +220,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}/include/QtCore
     ${CMAKE_BINARY_DIR}/include/QtXml
     ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
     ${FREETYPE_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
     ${PNG_INCLUDE_DIRS}
@@ -926,6 +927,15 @@ set(GUI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/widgets/qtoolbararealayout.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/widgets/qplaintextedit.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/widgets/qprintpreviewwidget.cpp
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-buffer.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-impl.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-open.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-stream.c
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp
+    ${CMAKE_SOURCE_DIR}/src/gui/text/qharfbuzz.cpp
 )
 
 # keep in sync with the top-level CMake file, only libraries setup is needed here
@@ -972,30 +982,6 @@ if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
     add_definitions(${FONTCONFIG_DEFINITIONS})
 endif()
 
-if(WITH_HARFBUZZ AND HARFBUZZ_FOUND)
-    set(EXTRA_GUI_LIBS
-        ${EXTRA_GUI_LIBS}
-        ${HARFBUZZ_LIBRARIES}
-    )
-    include_directories(${HARFBUZZ_INCLUDES})
-else()
-    set(GUI_SOURCES
-        ${GUI_SOURCES}
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-buffer.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gsub.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-impl.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-open.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-stream.c
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp
-        ${CMAKE_SOURCE_DIR}/src/gui/text/qharfbuzz.cpp
-    )
-    include_directories(
-        ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
-    )
-endif()
-
 if(WITH_ACCESSIBILITY)
     set(GUI_HEADERS
         ${GUI_HEADERS}