mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 18:08:10 +00:00
Fix scons qt4 pkg_config detection when there are multiple copies of Qt around
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24945 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
114f9755ec
commit
d7c279bd09
@ -352,7 +352,7 @@ def enable_modules(self, modules, debug=False) :
|
||||
self.AppendUnique(LIBPATH=[os.path.join(self["QTDIR"],"lib",module)])
|
||||
self.AppendUnique(CPPPATH=[os.path.join(self["QTDIR"],"include","qt4",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'],
|
||||
' '.join(modules)))
|
||||
|
Loading…
Reference in New Issue
Block a user