anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scons qt4 pkg_config detection when there are multiple copies of Qt around

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24945 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2008-05-26 17:00:11 +00:00
parent 114f9755ec
commit d7c279bd09
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/scons/qt4.py
View File

@ -352,7 +352,7 @@ def enable_modules(self, modules, debug=False) :
self.AppendUnique(LIBPATH=[os.path.join(self["QTDIR"],"lib",module)]) self.AppendUnique(LIBPATH=[os.path.join(self["QTDIR"],"lib",module)])
self.AppendUnique(CPPPATH=[os.path.join(self["QTDIR"],"include","qt4",module)]) self.AppendUnique(CPPPATH=[os.path.join(self["QTDIR"],"include","qt4",module)])
modules.remove(module) modules.remove(module)
self.ParseConfig('PKG_CONFIG_PATH=%s/lib pkg-config %s --libs --cflags'% self.ParseConfig('PKG_CONFIG_PATH=%s/lib/pkgconfig pkg-config %s --libs --cflags'%
( (
self['QTDIR'], self['QTDIR'],
' '.join(modules))) ' '.join(modules)))