.so libs have higher priority.

This commit is contained in:
lotodore
2010-10-30 17:43:49 +00:00
parent 7176185950
commit 6754d00db9
2 changed files with 54 additions and 54 deletions
+40 -40
View File
@@ -391,46 +391,46 @@ unix:!mac {
# to override the default '/usr' pass PREFIX
# variable to qmake.
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*) {
message("Found $$lib")
BOOST_THREAD = -l$$lib
}
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_FS = -l$$lib
}
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_FS = -l$$lib
}
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_IOSTREAMS = -l$$lib
}
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_IOSTREAMS = -l$$lib
}
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_REGEX = -l$$lib
}
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_REGEX = -l$$lib
}
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_SYS = -l$$lib
}
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_SYS = -l$$lib
}
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_THREAD = -l$$lib
}
for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_THREAD = -l$$lib
}
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_FS = -l$$lib
}
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_FS = -l$$lib
}
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_IOSTREAMS = -l$$lib
}
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_IOSTREAMS = -l$$lib
}
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib")
BOOST_REGEX = -l$$lib
}
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")
BOOST_SYS = -l$$lib
}
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.a) {
message("Found $$lib")
BOOST_SYS = -l$$lib
}
}
BOOST_LIBS = $$BOOST_THREAD \
$$BOOST_FS \
+14 -14
View File
@@ -211,51 +211,51 @@ unix : !mac {
#
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*) {
message("Found $$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")
BOOST_FS = -l$$lib
BOOST_THREAD = -l$$lib
}
for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
message("Found $$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")
BOOST_IOSTREAMS = -l$$lib
BOOST_FS = -l$$lib
}
for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
message("Found $$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")
BOOST_PROGRAM_OPTIONS = -l$$lib
BOOST_IOSTREAMS = -l$$lib
}
for(lib, BOOST_PROGRAM_OPTIONS):exists($${dir}/lib$${lib}.so*) {
message("Found $$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")
BOOST_REGEX = -l$$lib
BOOST_PROGRAM_OPTIONS = -l$$lib
}
for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
message("Found $$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")
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")
BOOST_SYS = -l$$lib
}