.so libs have higher priority.
This commit is contained in:
+12
-12
@@ -391,43 +391,43 @@ unix:!mac {
|
|||||||
# to override the default '/usr' pass PREFIX
|
# to override the default '/usr' pass PREFIX
|
||||||
# variable to qmake.
|
# variable to qmake.
|
||||||
for(dir, LIB_DIRS):exists($$dir) {
|
for(dir, LIB_DIRS):exists($$dir) {
|
||||||
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.a) {
|
|
||||||
message("Found $$lib")
|
|
||||||
BOOST_THREAD = -l$$lib
|
|
||||||
}
|
|
||||||
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_THREAD = -l$$lib
|
BOOST_THREAD = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_FS = -l$$lib
|
BOOST_THREAD = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_FS = -l$$lib
|
BOOST_FS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_IOSTREAMS = -l$$lib
|
BOOST_FS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_IOSTREAMS = -l$$lib
|
BOOST_IOSTREAMS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_REGEX = -l$$lib
|
BOOST_IOSTREAMS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_REGEX = -l$$lib
|
BOOST_REGEX = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.a) {
|
||||||
|
message("Found $$lib")
|
||||||
|
BOOST_REGEX = -l$$lib
|
||||||
|
}
|
||||||
|
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_SYS = -l$$lib
|
BOOST_SYS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_SYS = -l$$lib
|
BOOST_SYS = -l$$lib
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-14
@@ -211,51 +211,51 @@ unix : !mac {
|
|||||||
#
|
#
|
||||||
for(dir, LIB_DIRS){
|
for(dir, LIB_DIRS){
|
||||||
exists($$dir){
|
exists($$dir){
|
||||||
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.a) {
|
|
||||||
message("Found $$lib")
|
|
||||||
BOOST_THREAD = -l$$lib
|
|
||||||
}
|
|
||||||
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_THREAD = -l$$lib
|
BOOST_THREAD = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_FS = -l$$lib
|
BOOST_THREAD = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_FS = -l$$lib
|
BOOST_FS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_IOSTREAMS = -l$$lib
|
BOOST_FS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_IOSTREAMS = -l$$lib
|
BOOST_IOSTREAMS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_PROGRAM_OPTIONS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_PROGRAM_OPTIONS = -l$$lib
|
BOOST_IOSTREAMS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_PROGRAM_OPTIONS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_PROGRAM_OPTIONS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_PROGRAM_OPTIONS = -l$$lib
|
BOOST_PROGRAM_OPTIONS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_PROGRAM_OPTIONS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_REGEX = -l$$lib
|
BOOST_PROGRAM_OPTIONS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_REGEX = -l$$lib
|
BOOST_REGEX = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
|
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.a) {
|
||||||
|
message("Found $$lib")
|
||||||
|
BOOST_REGEX = -l$$lib
|
||||||
|
}
|
||||||
|
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_SYS = -l$$lib
|
BOOST_SYS = -l$$lib
|
||||||
}
|
}
|
||||||
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
|
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
|
||||||
message("Found $$lib")
|
message("Found $$lib")
|
||||||
BOOST_SYS = -l$$lib
|
BOOST_SYS = -l$$lib
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user