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 650def8..1cdf74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ 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 @@ ) add_definitions(-DHAVE_OT) +add_definitions(-DHAVE_FALLBACK) if (BUILD_SHARED_LIBS) add_definitions(-DHAVE_ATEXIT) @@ -101,6 +102,7 @@ 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 @@ ${HB_BASE_sources} ${HB_BASE_RAGEL_GENERATED_sources} + ${HB_FALLBACK_sources} ${HB_OT_sources} ${HB_OT_RAGEL_GENERATED_sources} ) @@ -388,4 +391,20 @@ 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 ()