walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Chun-wei Fan 2017-10-18 22:27:28 +08:00
parent 41b1984be9
commit 162575f2c6
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -41,7 +41,7 @@ if (APPLE)
endif () endif ()
if (WIN32) if (WIN32)
option(HB_HAVE_UNISCRIBE "Enable Uniscribe shaper backend on Windows" OFF) 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 () endif ()
option(HB_BUILD_UTILS "Build harfbuzz utils, needs cairo, freetype, and glib properly be installed" OFF) option(HB_BUILD_UTILS "Build harfbuzz utils, needs cairo, freetype, and glib properly be installed" OFF)
if (HB_BUILD_UTILS) if (HB_BUILD_UTILS)
@ -55,6 +55,7 @@ include_directories(AFTER
) )
add_definitions(-DHAVE_OT) add_definitions(-DHAVE_OT)
add_definitions(-DHAVE_FALLBACK)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
add_definitions(-DHAVE_ATEXIT) 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_sources ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_BASE_headers ${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_sources ${SRCSOURCES} "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_OT_headers ${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_sources}
${HB_BASE_RAGEL_GENERATED_sources} ${HB_BASE_RAGEL_GENERATED_sources}
${HB_FALLBACK_sources}
${HB_OT_sources} ${HB_OT_sources}
${HB_OT_RAGEL_GENERATED_sources} ${HB_OT_RAGEL_GENERATED_sources}
) )
@ -388,4 +391,20 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
FRAMEWORK DESTINATION Library/Frameworks 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 () endif ()

4
src/Makefile.sources
View File

@ -72,7 +72,9 @@ HB_NODIST_headers = \
hb-version.h \ hb-version.h \
$(NULL) $(NULL)
HB_FALLBACK_sources = hb-fallback-shape.cc HB_FALLBACK_sources = \
hb-fallback-shape.cc \
$(NULL)
HB_OT_sources = \ HB_OT_sources = \
hb-ot-font.cc \ hb-ot-font.cc \