jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow build with system supplied fontconfig,libxml2 even if we have

Browse source 
other dependencies built (this makes it easier for example to build
against just our own custom opencsg or just our own custom boost version)
This commit is contained in:
don bright 2016-09-04 16:05:49 -05:00
parent fb30128f6c
commit 2d5504bcc6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fontconfig.pri
View file

@ -14,8 +14,10 @@ FONTCONFIG_DIR = $$(FONTCONFIGDIR)
!isEmpty(OPENSCAD_LIBRARIES_DIR) {
isEmpty(FONTCONFIG_INCLUDEPATH) {
FONTCONFIG_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/fontconfig
FONTCONFIG_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
exists($$OPENSCAD_LIBRARIES_DIR/include/fontconfig) {
FONTCONFIG_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/fontconfig
FONTCONFIG_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
}
}
}

6
libxml2.pri
View file

@ -13,8 +13,10 @@ LIBXML2_DIR = $$(LIBXML2DIR)
!isEmpty(OPENSCAD_LIBRARIES_DIR) {
isEmpty(LIBXML2_INCLUDEPATH) {
LIBXML2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/libxml2
LIBXML2_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
exists($$OPENSCAD_LIBRARIES_DIR/include/libxml2) {
LIBXML2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/libxml2
LIBXML2_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
}
}
}