summaryrefslogtreecommitdiff
path: root/boost.pri
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2011-12-24 15:39:34 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2011-12-24 15:39:34 (GMT)
commit9a1834bb86b2cea2b8d26a506ca576918511ee5a (patch)
tree39002e7d2fd6aa1097b3bf3469e5ce2ca6731817 /boost.pri
parenta70715c309853ff9a47187d134649f27e4cb0867 (diff)
boost fix for OPENSCAD_LIBRARIES and BOOSTDIR env vars usage
Diffstat (limited to 'boost.pri')
-rw-r--r--boost.pri8
1 files changed, 6 insertions, 2 deletions
diff --git a/boost.pri b/boost.pri
index 2e8e3cb..19e4a64 100644
--- a/boost.pri
+++ b/boost.pri
@@ -23,9 +23,11 @@ boost {
# check for OPENSCAD_LIBDIR + multithread
isEmpty(BOOST_LINK_FLAGS) {
OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
- !isEmpty($$OPENSCAD_LIBDIR) {
+ !isEmpty(OPENSCAD_LIBDIR) {
exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) {
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
+ } else {
+ BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
}
}
}
@@ -33,9 +35,11 @@ boost {
# check for BOOSTDIR + multithread
isEmpty(BOOST_LINK_FLAGS) {
BOOST_DIR = $$(BOOSTDIR)
- !isEmpty($$BOOST_DIR) {
+ !isEmpty(BOOST_DIR) {
exists($$BOOST_DIR/lib/libboost*thread-mt*) {
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
+ } else {
+ BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
}
}
}
contact: Jan Huwald // Impressum