mirror of https://github.com/vitalif/openscad
fix boost qmake on 64-bit fedora where OPENSCAD_LIBRARIES has been set
parent
9a1834bb86
commit
3c69b71128
|
@ -27,10 +27,12 @@ boost {
|
||||||
exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) {
|
exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) {
|
||||||
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
|
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
|
||||||
} else {
|
} else {
|
||||||
|
exists($$OPENSCAD_LIBDIR/lib/libboost*thread*) {
|
||||||
BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
|
BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# check for BOOSTDIR + multithread
|
# check for BOOSTDIR + multithread
|
||||||
isEmpty(BOOST_LINK_FLAGS) {
|
isEmpty(BOOST_LINK_FLAGS) {
|
||||||
|
@ -39,10 +41,12 @@ boost {
|
||||||
exists($$BOOST_DIR/lib/libboost*thread-mt*) {
|
exists($$BOOST_DIR/lib/libboost*thread-mt*) {
|
||||||
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
|
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
|
||||||
} else {
|
} else {
|
||||||
|
exists($$BOOST_DIR/lib/libboost*thread*) {
|
||||||
BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
|
BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
isEmpty(BOOST_LINK_FLAGS) {
|
isEmpty(BOOST_LINK_FLAGS) {
|
||||||
unix {
|
unix {
|
||||||
|
|
Loading…
Reference in New Issue