[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 .circleci/config.yml |    3 ++-
 test/Makefile.am     |    6 ++++++
 test/api/Makefile.am |    1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 50163976d2a5fb34e0b4c011408d581b33aaa255
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Mon Dec 25 01:55:48 2017 +0330

    [cmake] Enable cmake tests on distribution and test it (#664)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b596ac1..4162488f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,8 @@ jobs:
       - checkout
       - run: apt update && apt install -y pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev
       - run: ./autogen.sh && make distdir
-      - run: cd harfbuzz-* && ./configure && make && make check && make install
+      - run: cd harfbuzz-* && ./configure && make && make check && make install && make clean
+      - run: cd harfbuzz-* && cmake -DHB_HAVE_FREETYPE=ON -DHB_HAVE_GLIB=ON -DHB_BUILD_UTILS=ON -Bbuild -H. -GNinja && ninja -Cbuild && ninja -Cbuild test && ninja -Cbuild install
 
   psvita:
     docker:
diff --git a/test/Makefile.am b/test/Makefile.am
index ec778226..ad496f55 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,13 @@
 # Process this file with automake to produce Makefile.in
 
+NULL =
+EXTRA_DIST =
 SUBDIRS = api shaping fuzzing
 
+EXTRA_DIST += \
+	CMakeLists.txt \
+	$(NULL)
+
 # Convenience targets:
 lib:
 	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 231ec22d..834f43b3 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -14,6 +14,7 @@ if HAVE_GLIB
 AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS)
 LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS)
 
+EXTRA_DIST += CMakeLists.txt
 EXTRA_DIST += hb-test.h
 
 check_PROGRAMS = $(TEST_PROGS)