From dfab7a254655f5ef5d68a2b92f0d5c197517c853 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 12 Mar 2020 21:05:01 +0330 Subject: [PATCH] [cmake] Bring it back to release tarball --- .circleci/config.yml | 6 ++++-- Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f5635a3bb..eea696e8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,12 +48,14 @@ jobs: - image: ubuntu:19.10 steps: - checkout - - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip meson + - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip meson cmake - run: pip install fonttools - run: ./autogen.sh - run: make -j32 - run: make distcheck || .ci/fail.sh - - run: rm harfbuzz-* && make distdir && cd harfbuzz-* && meson build && ninja -Cbuild test + - run: rm harfbuzz-* && make distdir + - run: cd harfbuzz-* && meson build && ninja -Cbuild test + - run: cd harfbuzz-* && cmake -Bcmakebuild -H. && cmake --build cmakebuild alpine-O3-Os-NOMMAP: docker: diff --git a/Makefile.am b/Makefile.am index 835bc193d..da291ec9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,11 +16,12 @@ EXTRA_DIST = \ CONFIG.md \ RELEASING.md \ TESTING.md \ + CMakeLists.txt \ + replace-enum-strings.cmake \ meson.build \ meson_options.txt \ meson-cc-tests/intel-atomic-primitives-test.c \ meson-cc-tests/solaris-atomic-operations.c \ - replace-enum-strings.cmake \ mingw-configure.sh \ mingw-ldd.py \ mingw32.sh \