From f7ea9f415b04e787434d61dd2044369983b37157 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Sat, 23 Aug 2014 22:29:11 +0200 Subject: [PATCH] Use OPENSCAD_LIBRARY include path only if it actually exists. --- freetype.pri | 6 ++++-- harfbuzz.pri | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/freetype.pri b/freetype.pri index 1f0f9655..0b13b742 100644 --- a/freetype.pri +++ b/freetype.pri @@ -14,8 +14,10 @@ FREETYPE_DIR = $$(FREETYPEDIR) !isEmpty(OPENSCAD_LIBRARIES_DIR) { isEmpty(FREETYPE_INCLUDEPATH) { - FREETYPE_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/freetype2 - FREETYPE_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib + exists($$OPENSCAD_LIBRARIES_DIR/include/freetype2) { + FREETYPE_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/freetype2 + FREETYPE_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib + } } } diff --git a/harfbuzz.pri b/harfbuzz.pri index 2a60096f..f3022bbd 100644 --- a/harfbuzz.pri +++ b/harfbuzz.pri @@ -14,8 +14,10 @@ HARFBUZZ_DIR = $$(HARFBUZZDIR) !isEmpty(OPENSCAD_LIBRARIES_DIR) { isEmpty(HARFBUZZ_INCLUDEPATH) { - HARFBUZZ_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/harfbuzz - HARFBUZZ_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib + exists($$OPENSCAD_LIBRARIES_DIR/include/harfbuzz) { + HARFBUZZ_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/harfbuzz + HARFBUZZ_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib + } } }