diff options
| author | Karol Kosek <krkk@krkk.ct8.pl> | 2021-01-02 13:10:29 +0100 |
|---|---|---|
| committer | Felix Queißner <felix@ib-queissner.de> | 2021-01-04 11:08:25 +0100 |
| commit | 7ec3ed15aa99148f1c8df86bb49202da67d6813d (patch) | |
| tree | 424c063d60304d933d7753fce03e97280339012a | |
| parent | 04d8ad2373faf5629eacfcc4987e6c6efabfe108 (diff) | |
| download | kristall-7ec3ed15aa99148f1c8df86bb49202da67d6813d.tar.gz | |
Allow to use external cmark
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/kristall.pro | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -31,8 +31,7 @@ kristall: build/kristall .PHONY: build/kristall build/kristall: src/* mkdir -p build - cd build; $(HOMEBREW_PATH) $(QMAKE_COMMAND) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS) - + cd build; $(HOMEBREW_PATH) $(QMAKE_COMMAND) CONFIG+=$(QMAKE_CONFIG) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS) install: kristall # Prepare directories $(MAKEDIR) $(sharedir)/icons/hicolor/scalable/apps/ diff --git a/src/kristall.pro b/src/kristall.pro index 9b96dba..5875a72 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -66,7 +66,12 @@ android: include(/home/felix/projects/android-hass/android-sdk/android_openssl/o # } -include($$PWD/../lib/cmark/cmark.pri) +external-cmark { + CONFIG += link_pkgconfig + PKGCONFIG += libcmark +} else { + include($$PWD/../lib/cmark/cmark.pri) +} INCLUDEPATH += $$PWD/../lib/luis-l-gist/ DEPENDPATH += $$PWD/../lib/luis-l-gist/ |