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

Fixes for DWrite header checks

This commit is contained in:
Luca Bacci 2022-07-06 19:22:38 +02:00 committed by Behdad Esfahbod
parent c091d029c2
commit 3a722c5354
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -80,6 +80,7 @@ include (FindPythonInterp)
## Functions and headers ## Functions and headers
include (CheckFunctionExists) include (CheckFunctionExists)
include (CheckIncludeFile) include (CheckIncludeFile)
include (CheckIncludeFiles)
macro (check_funcs) # Similar to AC_CHECK_FUNCS of autotools macro (check_funcs) # Similar to AC_CHECK_FUNCS of autotools
foreach (func_name ${ARGN}) foreach (func_name ${ARGN})
string(TOUPPER ${func_name} definition_to_add) string(TOUPPER ${func_name} definition_to_add)
@ -308,10 +309,14 @@ if (WIN32 AND HB_HAVE_UNISCRIBE)
endif () endif ()
if (WIN32 AND HB_HAVE_DIRECTWRITE) if (WIN32 AND HB_HAVE_DIRECTWRITE)
check_include_file_cxx(dwrite_1.h, HAVE_DWRITE_1_H) if (CMAKE_VERSION VERSION_GREATER 3.12)
if (NOT ${HAVE_DWRITE_1_H}) check_include_files("windows.h;dwrite_1.h" HAVE_DWRITE_1_H LANGUAGE CXX)
else ()
check_include_files("windows.h;dwrite_1.h" HAVE_DWRITE_1_H)
endif ()
if (NOT HAVE_DWRITE_1_H)
message(FATAL_ERROR "DirectWrite was enabled explicitly, but required header is missing") message(FATAL_ERROR "DirectWrite was enabled explicitly, but required header is missing")
endif() endif ()
add_definitions(-DHAVE_DIRECTWRITE) add_definitions(-DHAVE_DIRECTWRITE)
list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-directwrite.h) list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-directwrite.h)
endif () endif ()

2
configure.ac
View File

@ -366,7 +366,7 @@ AC_ARG_WITH(directwrite,
have_directwrite=false have_directwrite=false
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
if test "x$with_directwrite" = "xyes" -o "x$with_directwrite" = "xauto"; then if test "x$with_directwrite" = "xyes" -o "x$with_directwrite" = "xauto"; then
AC_CHECK_HEADERS(dwrite.h, have_directwrite=true) AC_CHECK_HEADERS(dwrite_1.h, have_directwrite=true)
fi fi
AC_LANG_POP([C++]) AC_LANG_POP([C++])
if test "x$with_directwrite" = "xyes" -a "x$have_directwrite" != "xtrue"; then if test "x$with_directwrite" = "xyes" -a "x$have_directwrite" != "xtrue"; then