[HarfBuzz] harfbuzz: Branch 'master' - 7 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sun Oct 22 21:08:41 UTC 2017
CMakeLists.txt | 306 ++++++++++++++++++++++++++++++++++++++++++++-
Makefile.am | 1
replace-enum-strings.cmake | 21 +++
src/Makefile.sources | 4
4 files changed, 325 insertions(+), 7 deletions(-)
New commits:
commit d59d5dc7d339deb45cc84cffd084b52752765a08
Merge: ced86da7 3ee15a60
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sun Oct 22 17:08:29 2017 -0400
Merge commit '3ee15a60358f4d894bbf2431d7a7df38b7acc4ce'
commit ced86da7ddbbd0d64f8ba1290b8e67600b1db2d4
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sun Oct 22 17:03:36 2017 -0400
Another try at fixing mingw32 build bot fail
diff --git a/src/hb-private.hh b/src/hb-private.hh
index 333199a3..3d617e2a 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -337,10 +337,10 @@ static inline HB_CONST_FUNC unsigned int
_hb_popcount64 (uint64_t mask)
{
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
- return __builtin_popcountl (mask);
-#else
- return _hb_popcount32 (mask) + _hb_popcount32 (mask >> 32);
+ if (sizeof (long) >= sizeof (mask))
+ return __builtin_popcountl (mask);
#endif
+ return _hb_popcount32 (mask) + _hb_popcount32 (mask >> 32);
}
template <typename T> static inline unsigned int _hb_popcount (T mask);
template <> inline unsigned int _hb_popcount<uint32_t> (uint32_t mask) { return _hb_popcount32 (mask); }
commit bc1183aa6ba45a527084d391d6e7f801d6196060
Merge: d45a2138 bfe0faf1
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sun Oct 22 17:06:00 2017 -0400
Merge commit 'bfe0faf1a2d39302129a7202994456afd96694ca'
commit d45a2138d9d54eab158046d6503f1bb104efce25
Merge: d8adaa97 41b18251
Author: ebraminio <ebrahim at gnu.org>
Date: Sat Oct 21 10:19:55 2017 +0330
Merge pull request #572 from fanc999/master.msvc
builds: Support HarfBuzz-GObject and introspection in CMake builds
commit 41b1825196235d4337c76f97e09f0b7c6d6c56ae
Author: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Thu Oct 19 18:36:32 2017 +0800
CMake builds: Support introspection builds
This adds support for introspection builds on Windows that is enabled by
the HB_HAVE_INTROSPECTION option, which will also enable HB_HAVE_GOBJECT
(and so HB_HAVE_GLIB) as they are required for introspection.
In order for this to work one must ensure that the Python installation
listed in PYTHON_EXECUTABLE is the same Python release series that was
used to build _giscanner.pyd (the Python module that is used by
g-ir-scanner), with the same architecture. PKG_CONFIG_PATH and PATH
must be set correctly if $(PREFIX)\bin and/or $(PREFIX)\lib\pkgconfig
are not in the standard PATH and PKG_CONFIG_PATH, which is actually
in-line with the *NIX builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd237537..8d282575 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,12 @@ if (HB_HAVE_GOBJECT)
set(HB_HAVE_GLIB ON)
endif ()
+option(HB_HAVE_INTROSPECTION "Enable building introspection (.gir/.typelib) files" OFF)
+if (HB_HAVE_INTROSPECTION)
+ set(HB_HAVE_GOBJECT ON)
+ set(HB_HAVE_GLIB ON)
+endif ()
+
include_directories(AFTER
${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/src
@@ -181,6 +187,8 @@ set(project_sources
${HB_OT_RAGEL_GENERATED_sources}
)
+set(project_extra_sources)
+
set(project_headers
${HB_VERSION_H}
@@ -226,10 +234,8 @@ if (HB_BUILTIN_UCDN)
include_directories(src/hb-ucdn)
add_definitions(-DHAVE_UCDN)
- list(APPEND project_sources
- ${PROJECT_SOURCE_DIR}/src/hb-ucdn.cc
- ${LIBHB_UCDN_sources}
- )
+ list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-ucdn.cc)
+ list(APPEND project_extra_sources ${LIBHB_UCDN_sources})
endif ()
if (HB_HAVE_GLIB)
@@ -362,9 +368,12 @@ if (HB_HAVE_GOBJECT)
list(APPEND hb_gobject_gen_sources
${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc
)
+ list(APPEND hb_gobject_structs_headers
+ ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.h
+ )
list(APPEND hb_gobject_headers
${PROJECT_SOURCE_DIR}/src/hb-gobject.h
- ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.h
+ ${hb_gobject_structs_headers}
)
list(APPEND hb_gobject_gen_headers
${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h
@@ -376,7 +385,7 @@ if (HB_HAVE_GOBJECT)
--template=${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.h.tmpl
--identifier-prefix hb_
--symbol-prefix hb_gobject
- ${hb_gobject_header}
+ ${hb_gobject_structs_headers}
${project_headers}
> ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h.tmp
COMMAND "${CMAKE_COMMAND}"
@@ -441,7 +450,7 @@ endif ()
## Define harfbuzz library
-add_library(harfbuzz ${project_sources} ${project_headers})
+add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers})
target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS})
## Define harfbuzz-gobject library
@@ -457,6 +466,129 @@ if (HB_HAVE_GOBJECT)
target_link_libraries(harfbuzz-gobject harfbuzz ${GOBJECT_LIBRARIES} ${THIRD_PARTY_LIBS})
endif ()
+# On Windows, g-ir-scanner requires a DLL build in order for it to work
+if (WIN32)
+ if (NOT BUILD_SHARED_LIBS)
+ message("Building introspection files on Windows requires BUILD_SHARED_LIBS to be enabled.")
+ set(HB_HAVE_INTROSPECTION OFF)
+ endif ()
+endif ()
+
+if (HB_HAVE_INTROSPECTION)
+
+ find_package(PkgConfig)
+ pkg_check_modules(PC_GI QUIET gobject-introspection-1.0)
+
+ find_program(G_IR_SCANNER g-ir-scanner
+ HINTS ${PC_g_ir_scanner}
+ )
+
+ find_program(G_IR_COMPILER g-ir-compiler
+ HINTS ${PC_g_ir_compiler}
+ )
+
+ if (WIN32 AND NOT MINGW)
+ # Note that since we already enable HB_HAVE_GOBJECT
+ # we would already have PYTHON_EXECUTABLE handy
+ set(G_IR_SCANNER_CMD "${PYTHON_EXECUTABLE}" "${G_IR_SCANNER}")
+ else ()
+ set(G_IR_SCANNER_CMD "${G_IR_SCANNER}")
+ endif ()
+
+ # We need to account for the varying output directories
+ # when we build using Visual Studio projects
+ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+ set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
+ else ()
+ set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
+ endif ()
+
+ # Get the CFlags that we used to build HarfBuzz/HarfBuzz-GObject
+ set (hb_defines_cflags "")
+ foreach(hb_cflag ${hb_cflags})
+ list(APPEND hb_defines_cflags "-D${hb_cflag}")
+ endforeach(hb_cflag)
+
+ # Get the other dependent libraries we used to build HarfBuzz/HarfBuzz-GObject
+ set (extra_libs "")
+ foreach (extra_lib ${THIRD_PARTY_LIBS})
+ # We don't want the .lib extension here...
+ string(REPLACE ".lib" "" extra_lib_stripped "${extra_lib}")
+ list(APPEND extra_libs "--extra-library=${extra_lib_stripped}")
+ endforeach ()
+
+ set(introspected_sources)
+ foreach (f
+ ${project_headers}
+ ${project_sources}
+ ${hb_gobject_gen_sources}
+ ${hb_gobject_gen_headers}
+ ${hb_gobject_sources}
+ ${hb_gobject_headers}
+ )
+ if (WIN32)
+ # Nasty issue: We need to make drive letters lower case,
+ # otherwise g-ir-scanner won't like it and give us a bunch
+ # of invalid items and unresolved types...
+ STRING(SUBSTRING "${f}" 0 1 drive)
+ STRING(SUBSTRING "${f}" 1 -1 path)
+ if (drive MATCHES "[A-Z]")
+ STRING(TOLOWER ${drive} drive_lower)
+ list(APPEND introspected_sources "${drive_lower}${path}")
+ else ()
+ list(APPEND introspected_sources "${f}")
+ endif ()
+ else ()
+ list(APPEND introspected_sources "${f}")
+ endif ()
+ endforeach ()
+
+ # Finally, build the introspection files...
+ add_custom_command (
+ TARGET harfbuzz-gobject
+ POST_BUILD
+ COMMAND ${G_IR_SCANNER_CMD}
+ --warn-all --no-libtool --verbose
+ -n hb
+ --namespace=HarfBuzz
+ --nsversion=0.0
+ --identifier-prefix=hb_
+ --include GObject-2.0
+ --pkg-export=harfbuzz
+ --cflags-begin
+ -I${PROJECT_SOURCE_DIR}/src
+ -I${PROJECT_BINARY_DIR}/src
+ ${hb_includedir_cflags}
+ ${hb_defines_cflags}
+ -DHB_H
+ -DHB_H_IN
+ -DHB_OT_H
+ -DHB_OT_H_IN
+ -DHB_GOBJECT_H
+ -DHB_GOBJECT_H_IN
+ -DHB_EXTERN=
+ --cflags-end
+ --library=harfbuzz-gobject
+ --library=harfbuzz
+ -L${hb_libpath}
+ ${extra_libs}
+ ${introspected_sources}
+ -o ${hb_libpath}/HarfBuzz-0.0.gir
+ DEPENDS harfbuzz-gobject harfbuzz
+ )
+
+ add_custom_command (
+ TARGET harfbuzz-gobject
+ POST_BUILD
+ COMMAND "${G_IR_COMPILER}"
+ --verbose --debug
+ --includedir ${CMAKE_CURRENT_BINARY_DIR}
+ ${hb_libpath}/HarfBuzz-0.0.gir
+ -o ${hb_libpath}/HarfBuzz-0.0.typelib
+ DEPENDS ${hb_libpath}/HarfBuzz-0.0.gir harfbuzz-gobject
+ )
+endif ()
+
## Additional framework build configs
if (BUILD_FRAMEWORK)
set(CMAKE_MACOSX_RPATH ON)
@@ -534,5 +666,20 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)
+ if (HB_HAVE_INTROSPECTION)
+ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+ set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
+ else ()
+ set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
+ endif ()
+
+ install(FILES "${hb_libpath}/HarfBuzz-0.0.gir"
+ DESTINATION share/gir-1.0
+ )
+
+ install(FILES "${hb_libpath}/HarfBuzz-0.0.typelib"
+ DESTINATION lib/girepository-1.0
+ )
+ endif ()
endif ()
endif ()
commit 53db221259b5eea4d2244321b2fe96beb39aef7d
Author: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Wed Oct 18 15:43:57 2017 +0800
CMake: Support building HarfBuzz-GObject
This adds support to the CMake build files to support building
HarfBuzz-GObject, which is actually a little bit complicated,
as we need to:
-Run glib-mkenums, which is a Python (for newer GLib/GObject) or PERL
(for older, pre 2.53.4, GLib/GObject) script. This matters more for
Visual Studio builds as shebang lines are not supported, so we need to
test-run it with PERL or Python to determine which is the correct
interpretor to use.
-Next, we need to replace strings in the sources that we obtain from
running glib-mkenums. So, the solution here is to use a small utility
CMake script for our purposes here, to maintain maximum compatibility.
-Ensure that things do work in the Visual Studio IDE builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cdf74bb..fd237537 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,11 @@ if (HB_BUILD_UTILS)
set(HB_HAVE_FREETYPE ON)
endif ()
+option(HB_HAVE_GOBJECT "Enable GObject Bindings" OFF)
+if (HB_HAVE_GOBJECT)
+ set(HB_HAVE_GLIB ON)
+endif ()
+
include_directories(AFTER
${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/src
@@ -301,6 +306,107 @@ if (WIN32 AND HB_HAVE_DIRECTWRITE)
list(APPEND THIRD_PARTY_LIBS dwrite rpcrt4)
endif ()
+if (HB_HAVE_GOBJECT)
+ include(FindPythonInterp)
+ include(FindPerl)
+
+ # Use the hints from glib-2.0.pc to find glib-mkenums
+ find_package(PkgConfig)
+ pkg_check_modules(PC_GLIB QUIET glib-2.0)
+ find_program(GLIB_MKENUMS glib-mkenums
+ HINTS ${PC_glib_mkenums}
+ )
+ set(GLIB_MKENUMS_CMD)
+
+ if (WIN32 AND NOT MINGW)
+ # In Visual Studio builds, shebang lines are not supported
+ # in the standard cmd.exe shell that we use, so we need to
+ # first determine whether glib-mkenums is a Python or PERL
+ # script
+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${GLIB_MKENUMS}" --version
+ RESULT_VARIABLE GLIB_MKENUMS_PYTHON
+ OUTPUT_QUIET ERROR_QUIET
+ )
+ if (GLIB_MKENUMS_PYTHON EQUAL 0)
+ message("${GLIB_MKENUMS} is a Python script.")
+ set(GLIB_MKENUMS_CMD "${PYTHON_EXECUTABLE}" "${GLIB_MKENUMS}")
+ else ()
+ execute_process(COMMAND "${PERL_EXECUTABLE}" "${GLIB_MKENUMS}" --version
+ RESULT_VARIABLE GLIB_MKENUMS_PERL
+ OUTPUT_QUIET ERROR_QUIET
+ )
+ if (GLIB_MKENUMS_PERL EQUAL 0)
+ message("${GLIB_MKENUMS} is a PERL script.")
+ set(GLIB_MKENUMS_CMD "${PERL_EXECUTABLE}" "${GLIB_MKENUMS}")
+ endif ()
+ if (NOT GLIB_MKENUMS_PERL EQUAL 0 AND NOT GLIB_MKENUMS_PYTHON EQUAL 0)
+ message(FATAL_ERROR "Unable to determine type of glib-mkenums script")
+ endif ()
+ endif ()
+ else ()
+ set(GLIB_MKENUMS_CMD "${GLIB_MKENUMS}")
+ endif ()
+ if (NOT GLIB_MKENUMS_CMD)
+ message(FATAL_ERROR "HB_HAVE_GOBJECT was set, but we failed to find glib-mkenums, which is required")
+ endif()
+
+ pkg_check_modules(PC_GOBJECT QUIET gobject-2.0)
+
+ find_library(GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS})
+ find_path(GOBJECT_INCLUDE_DIR NAMES glib-object.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0)
+
+ include_directories(${GOBJECTCONFIG_INCLUDE_DIR} ${GOBJECT_INCLUDE_DIR})
+ mark_as_advanced(GOBJECT_LIBRARIES GOBJECT_INCLUDE_DIR)
+
+ list(APPEND hb_gobject_sources ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.cc)
+ list(APPEND hb_gobject_gen_sources
+ ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc
+ )
+ list(APPEND hb_gobject_headers
+ ${PROJECT_SOURCE_DIR}/src/hb-gobject.h
+ ${PROJECT_SOURCE_DIR}/src/hb-gobject-structs.h
+ )
+ list(APPEND hb_gobject_gen_headers
+ ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h
+ )
+
+ add_custom_command (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h
+ COMMAND ${GLIB_MKENUMS_CMD}
+ --template=${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.h.tmpl
+ --identifier-prefix hb_
+ --symbol-prefix hb_gobject
+ ${hb_gobject_header}
+ ${project_headers}
+ > ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h.tmp
+ COMMAND "${CMAKE_COMMAND}"
+ "-DENUM_INPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h.tmp"
+ "-DENUM_OUTPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h"
+ -P ${PROJECT_SOURCE_DIR}/replace-enum-strings.cmake
+ DEPENDS ${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.h.tmpl
+ ${hb_gobject_header}
+ ${project_headers}
+ )
+
+ add_custom_command (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc
+ COMMAND ${GLIB_MKENUMS_CMD}
+ --template=${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.cc.tmpl
+ --identifier-prefix hb_
+ --symbol-prefix hb_gobject
+ ${hb_gobject_header}
+ ${project_headers}
+ > ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc.tmp
+ COMMAND "${CMAKE_COMMAND}"
+ "-DENUM_INPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc.tmp"
+ "-DENUM_OUTPUT_SRC=${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.cc"
+ -P ${PROJECT_SOURCE_DIR}/replace-enum-strings.cmake
+ DEPENDS ${PROJECT_SOURCE_DIR}/src/hb-gobject-enums.cc.tmpl
+ ${CMAKE_CURRENT_BINARY_DIR}/src/hb-gobject-enums.h
+ ${hb_gobject_header}
+ ${project_headers}
+ )
+endif ()
## Atomic ops availability detection
file(WRITE "${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c"
@@ -338,6 +444,18 @@ endif ()
add_library(harfbuzz ${project_sources} ${project_headers})
target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS})
+## Define harfbuzz-gobject library
+if (HB_HAVE_GOBJECT)
+ add_library(harfbuzz-gobject
+ ${hb_gobject_sources}
+ ${hb_gobject_gen_sources}
+ ${hb_gobject_headers}
+ ${hb_gobject_gen_headers}
+ )
+ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/src)
+ add_dependencies(harfbuzz-gobject harfbuzz)
+ target_link_libraries(harfbuzz-gobject harfbuzz ${GOBJECT_LIBRARIES} ${THIRD_PARTY_LIBS})
+endif ()
## Additional framework build configs
if (BUILD_FRAMEWORK)
@@ -382,6 +500,9 @@ endif ()
## Install
if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
install(FILES ${project_headers} DESTINATION include/harfbuzz)
+ if (HB_HAVE_GOBJECT)
+ install(FILES ${hb_gobject_headers} ${hb_gobject_gen_headers} DESTINATION include/harfbuzz)
+ endif ()
endif ()
if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
@@ -407,4 +528,11 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
RUNTIME DESTINATION bin
)
endif ()
+ if (HB_HAVE_GOBJECT)
+ install(TARGETS harfbuzz-gobject
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin
+ )
+ endif ()
endif ()
diff --git a/Makefile.am b/Makefile.am
index 07b38c28..fde52564 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
BUILD.md \
RELEASING.md \
CMakeLists.txt \
+ replace-enum-strings.cmake \
$(NULL)
MAINTAINERCLEANFILES = \
diff --git a/replace-enum-strings.cmake b/replace-enum-strings.cmake
new file mode 100644
index 00000000..42fdbff9
--- /dev/null
+++ b/replace-enum-strings.cmake
@@ -0,0 +1,21 @@
+# CMake script to replace items
+# in sources generated by glib-mkenums
+
+FILE(READ ${ENUM_INPUT_SRC} enum_in)
+
+STRING(REPLACE
+ "_t_get_type"
+ "_get_type"
+ enum_out_tmp
+ "${enum_in}"
+ )
+
+STRING(REPLACE
+ "_T ("
+ " ("
+ enum_out
+ "${enum_out_tmp}"
+ )
+
+FILE(WRITE ${ENUM_OUTPUT_SRC} "${enum_out}")
+FILE(REMOVE ${ENUM_INPUT_SRC})
\ No newline at end of file
commit 162575f2c69f519aae1b18ff1c501e7e4c2cdd4b
Author: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Wed Oct 18 22:27:28 2017 +0800
CMake builds: Fix builds
Include the fallback sources in the build, and update
src/Makefile.sources so that it can be read by the CMake build files.
Fix a typo in the DirectWrite configure option so that we can properly
enable DirectWrite builds.
Also, when building the utility program, install them as well.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 650def81..1cdf74bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if (APPLE)
endif ()
if (WIN32)
option(HB_HAVE_UNISCRIBE "Enable Uniscribe shaper backend on Windows" OFF)
- option(HB_HAVE_DIRECWRITE "Enable DirectWrite shaper backend on Windows" OFF)
+ option(HB_HAVE_DIRECTWRITE "Enable DirectWrite shaper backend on Windows" OFF)
endif ()
option(HB_BUILD_UTILS "Build harfbuzz utils, needs cairo, freetype, and glib properly be installed" OFF)
if (HB_BUILD_UTILS)
@@ -55,6 +55,7 @@ include_directories(AFTER
)
add_definitions(-DHAVE_OT)
+add_definitions(-DHAVE_FALLBACK)
if (BUILD_SHARED_LIBS)
add_definitions(-DHAVE_ATEXIT)
@@ -101,6 +102,7 @@ file(READ ${PROJECT_SOURCE_DIR}/src/hb-ucdn/Makefile.sources UCDNSOURCES)
extract_make_variable(HB_BASE_sources ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_BASE_headers ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
+extract_make_variable(HB_FALLBACK_sources ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_OT_sources ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_OT_headers ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
@@ -169,6 +171,7 @@ set(project_sources
${HB_BASE_sources}
${HB_BASE_RAGEL_GENERATED_sources}
+ ${HB_FALLBACK_sources}
${HB_OT_sources}
${HB_OT_RAGEL_GENERATED_sources}
)
@@ -388,4 +391,20 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
RUNTIME DESTINATION bin
FRAMEWORK DESTINATION Library/Frameworks
)
+ if (HB_BUILD_UTILS)
+ install(TARGETS hb-view
+ RUNTIME DESTINATION bin
+ )
+ install(TARGETS hb-view
+ RUNTIME DESTINATION bin
+ )
+
+ install(TARGETS hb-shape
+ RUNTIME DESTINATION bin
+ )
+
+ install(TARGETS hb-ot-shape-closure
+ RUNTIME DESTINATION bin
+ )
+ endif ()
endif ()
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 775068ef..9fe8a40e 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -72,7 +72,9 @@ HB_NODIST_headers = \
hb-version.h \
$(NULL)
-HB_FALLBACK_sources = hb-fallback-shape.cc
+HB_FALLBACK_sources = \
+ hb-fallback-shape.cc \
+ $(NULL)
HB_OT_sources = \
hb-ot-font.cc \
More information about the HarfBuzz
mailing list