Use OPENSCAD_LIBRARY include path only if it actually exists.

master
Torsten Paul 2014-08-23 22:29:11 +02:00
parent 28ded1166e
commit f7ea9f415b
2 changed files with 8 additions and 4 deletions

View File

@ -14,9 +14,11 @@ FREETYPE_DIR = $$(FREETYPEDIR)
!isEmpty(OPENSCAD_LIBRARIES_DIR) { !isEmpty(OPENSCAD_LIBRARIES_DIR) {
isEmpty(FREETYPE_INCLUDEPATH) { isEmpty(FREETYPE_INCLUDEPATH) {
exists($$OPENSCAD_LIBRARIES_DIR/include/freetype2) {
FREETYPE_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/freetype2 FREETYPE_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/freetype2
FREETYPE_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib FREETYPE_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
} }
}
} }
isEmpty(FREETYPE_INCLUDEPATH) { isEmpty(FREETYPE_INCLUDEPATH) {

View File

@ -14,9 +14,11 @@ HARFBUZZ_DIR = $$(HARFBUZZDIR)
!isEmpty(OPENSCAD_LIBRARIES_DIR) { !isEmpty(OPENSCAD_LIBRARIES_DIR) {
isEmpty(HARFBUZZ_INCLUDEPATH) { isEmpty(HARFBUZZ_INCLUDEPATH) {
exists($$OPENSCAD_LIBRARIES_DIR/include/harfbuzz) {
HARFBUZZ_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/harfbuzz HARFBUZZ_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/harfbuzz
HARFBUZZ_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib HARFBUZZ_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
} }
}
} }
isEmpty(HARFBUZZ_INCLUDEPATH) { isEmpty(HARFBUZZ_INCLUDEPATH) {