From: Bo Peng Date: Sun, 2 Jul 2006 01:54:44 +0000 (+0000) Subject: Scons: set default qt lib directory under cygwin X-Git-Tag: 1.6.10~13030 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b0abcefcc014eedd7d40a4f0c6e55bfe76c3961c;p=features.git Scons: set default qt lib directory under cygwin git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14286 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 640510cf21..82201b312b 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -547,8 +547,14 @@ else: if env.has_key('qt_lib_path') and env['qt_lib_path']: qt_lib_path = env.subst('$qt_lib_path') -else: +elif os.path.isdir(os.path.join(env.subst('$QTDIR'), 'lib')): qt_lib_path = env.subst('$QTDIR/lib') +# this is the path for cygwin. +elif os.path.idsir(os.path.join('/usr/lib/', frontend, 'lib')): + qt_lib_path = env.subst('/usr/lib/$frontend/lib') +else: + print "Qt library directory is not found. Please specify it using qt_lib_path" + Exit(1) env.AppendUnique(LIBPATH = [qt_lib_path]) # qt4 seems to be using pkg_config env.PrependENVPath('PKG_CONFIG_PATH', qt_lib_path)