look for libs in $$system(qmake -query QT_INSTALL_LIBS)
This commit is contained in:
committed by
Evgeni Golov
parent
62ee15a4c8
commit
6c5b79709f
+2
-2
@@ -41,13 +41,13 @@ unix : !mac {
|
||||
|
||||
QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
|
||||
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
|
||||
BOOST_SYS = boost_system boost_system-mt
|
||||
|
||||
|
||||
#
|
||||
# searching in $PREFIX/lib and $PREFIX/lib64
|
||||
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
|
||||
# to override the default '/usr' pass PREFIX
|
||||
# variable to qmake.
|
||||
#
|
||||
|
||||
@@ -42,14 +42,14 @@ unix : !mac {
|
||||
|
||||
QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
|
||||
BOOST_THREAD = boost_thread boost_thread-mt
|
||||
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
|
||||
BOOST_SYS = boost_system boost_system-mt
|
||||
|
||||
|
||||
#
|
||||
# searching in $PREFIX/lib and $PREFIX/lib64
|
||||
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
|
||||
# to override the default '/usr' pass PREFIX
|
||||
# variable to qmake.
|
||||
#
|
||||
|
||||
+3
-2
@@ -407,7 +407,8 @@ unix:!mac {
|
||||
!android{
|
||||
LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
|
||||
LIB_DIRS = $${PREFIX}/lib \
|
||||
$${PREFIX}/lib64
|
||||
$${PREFIX}/lib64 \
|
||||
$$system(qmake -query QT_INSTALL_LIBS)
|
||||
}
|
||||
android{
|
||||
LIBPATH += $${PREFIX}/lib/armv7
|
||||
@@ -426,7 +427,7 @@ unix:!mac {
|
||||
BOOST_RANDOM = boost_random \
|
||||
boost_random-mt
|
||||
|
||||
# searching in $PREFIX/lib and $PREFIX/lib64
|
||||
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
|
||||
# to override the default '/usr' pass PREFIX
|
||||
# variable to qmake.
|
||||
for(dir, LIB_DIRS):exists($$dir) {
|
||||
|
||||
+2
-2
@@ -175,7 +175,7 @@ unix : !mac {
|
||||
|
||||
LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
|
||||
INCLUDEPATH += $${PREFIX}/include
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
|
||||
BOOST_FS = boost_filesystem boost_filesystem-mt
|
||||
BOOST_THREAD = boost_thread boost_thread-mt
|
||||
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
|
||||
@@ -185,7 +185,7 @@ unix : !mac {
|
||||
BOOST_RANDOM = boost_random boost_random-mt
|
||||
|
||||
#
|
||||
# searching in $PREFIX/lib and $PREFIX/lib64
|
||||
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS)
|
||||
# to override the default '/usr' pass PREFIX
|
||||
# variable to qmake.
|
||||
#
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ unix : !mac {
|
||||
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
|
||||
#QMAKE_LFLAGS += -Wl,--gc-sections
|
||||
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
|
||||
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
|
||||
BOOST_FS = boost_filesystem boost_filesystem-mt
|
||||
BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
|
||||
BOOST_SYSTEM = boost_system boost_system-mt
|
||||
|
||||
Reference in New Issue
Block a user