From 3c69b711288ad6f7c0290e8f907da5a988180e9d Mon Sep 17 00:00:00 2001 From: don bright Date: Sat, 24 Dec 2011 07:43:46 -0800 Subject: [PATCH] fix boost qmake on 64-bit fedora where OPENSCAD_LIBRARIES has been set --- boost.pri | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/boost.pri b/boost.pri index 19e4a640..02e42471 100644 --- a/boost.pri +++ b/boost.pri @@ -27,7 +27,9 @@ boost { 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 + exists($$OPENSCAD_LIBDIR/lib/libboost*thread*) { + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options + } } } } @@ -39,7 +41,9 @@ boost { 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 + exists($$BOOST_DIR/lib/libboost*thread*) { + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options + } } } }